From 51bac70cb7e91b78d59e789c9925f2db59f1f9bc Mon Sep 17 00:00:00 2001
From: klever1988 <56048681+klever1988@users.noreply.github.com>
Date: Fri, 21 Feb 2020 08:05:47 +0800
Subject: [PATCH] Update r1s_lienol.yml

---
 .github/workflows/r1s_lienol.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/r1s_lienol.yml b/.github/workflows/r1s_lienol.yml
index a669e84..3366bc1 100644
--- a/.github/workflows/r1s_lienol.yml
+++ b/.github/workflows/r1s_lienol.yml
@@ -41,6 +41,8 @@ jobs:
           cd friendlywrt-h5
           repo init -u https://github.com/friendlyarm/friendlywrt_manifests -b master -m h5.xml --repo-url=https://github.com/friendlyarm/repo  --no-clone-bundle
           repo sync -c  --no-clone-bundle
+          rm -rf friendlywrt/
+          git clone https://github.com/friendlyarm/friendlywrt
           
       - name: Mods
         run: |
@@ -72,11 +74,13 @@ jobs:
           git checkout upstream/dev-19.07 -b tmp
           git revert --no-edit 2202533d29c1494ad5645f87a7429e70f85a0110
           git mv README.md README && git commit -m 'undo rename readme for rebasing'
-          git checkout origin/master
-          git rebase 90bb1cf9c33e73de5019686b8bd495f689e675a4^ --onto tmp -X theirs
+          git checkout origin/master-v19.07.1
+          git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs
+          git cherry-pick origin/master 8f734f05f11b9f94af3cf1469537587ef102e5f2^...origin/HEAD
           git checkout upstream/dev-19.07 -- feeds.conf.default
           #sed -i '/exit/i\echo "iptables -t nat -I POSTROUTING -j MASQUERADE" >> /etc/firewall.user' package/default-settings/files/zzz-default-settings
           sed -i 's/option fullcone	1/option fullcone	0/' package/network/config/firewall/files/firewall.config
+          sed -i '/8.8.8.8/d' package/base-files/files/root/setup.sh
           
       - name: Clean Feeds
         run: |