Update r2s_lienol.yml

This commit is contained in:
klever1988
2020-04-11 19:51:50 +08:00
committed by GitHub
parent c5b768e827
commit fa9ea299ec

View File

@@ -65,7 +65,7 @@ jobs:
git mv README.md README && git commit -m 'undo rename readme for rebasing' git mv README.md README && git commit -m 'undo rename readme for rebasing'
git checkout origin/master-v19.07.1 git checkout origin/master-v19.07.1
git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs
git revert --no-edit f092ca098e80c667b10cdd1dba328506a2673c1d sed -i '/ipv6/,+3d' package/base-files/files/root/setup.sh
git checkout upstream/dev-19.07 -- feeds.conf.default git checkout upstream/dev-19.07 -- feeds.conf.default
sed -i '/exit/i\chown -R root:root /usr/share/netdata/web' package/default-settings/files/zzz-default-settings sed -i '/exit/i\chown -R root:root /usr/share/netdata/web' package/default-settings/files/zzz-default-settings
sed -i 's/option fullcone\t1/option fullcone\t0/' package/network/config/firewall/files/firewall.config sed -i 's/option fullcone\t1/option fullcone\t0/' package/network/config/firewall/files/firewall.config