diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml index 382f414..284861a 100644 --- a/.github/workflows/lo-test.yml +++ b/.github/workflows/lo-test.yml @@ -115,7 +115,8 @@ jobs: pushd bin/ && . ../files/etc/opkg/distfeeds.conf | tee ../files/etc/opkg/distfeeds.conf && popd make -j$(($(nproc) + 1)) sudo umount files/local_feed/core files/local_feed/base - + rm files/etc/opkg/distfeeds.conf + echo "=======================" echo "Space usage:" echo "=======================" diff --git a/patches.sh b/patches.sh index ffe80c9..72ca4db 100644 --- a/patches.sh +++ b/patches.sh @@ -17,4 +17,3 @@ sed -i 's/192.168.1.1/192.168.2.1/' package/base-files/files/bin/config_generate rm -rf files mv $GITHUB_WORKSPACE/files ./ chmod 600 files/etc/dropbear/* -sed -i "s/DEVICE/$DEVICE/" files/etc/opkg/distfeeds.conf diff --git a/r1s-h3.config.seed b/r1s-h3.config.seed index 1bc65b6..a26f7f1 100644 --- a/r1s-h3.config.seed +++ b/r1s-h3.config.seed @@ -73,6 +73,8 @@ CONFIG_PACKAGE_iptables-mod-conntrack-extra=y CONFIG_PACKAGE_iptables-mod-ipopt=y CONFIG_PACKAGE_iptables-mod-tproxy=y CONFIG_PACKAGE_kmod-tcp-bbr=y +CONFIG_PACKAGE_kmod-ipt-offload=y +CONFIG_PACKAGE_kmod-fast-classifier=y CONFIG_DROPBEAR_ECC=y CONFIG_DROPBEAR_ECC_FULL=y diff --git a/r1s.config.seed b/r1s.config.seed index c6a2be6..2750dbb 100644 --- a/r1s.config.seed +++ b/r1s.config.seed @@ -73,6 +73,8 @@ CONFIG_PACKAGE_iptables-mod-conntrack-extra=y CONFIG_PACKAGE_iptables-mod-ipopt=y CONFIG_PACKAGE_iptables-mod-tproxy=y CONFIG_PACKAGE_kmod-tcp-bbr=y +CONFIG_PACKAGE_kmod-ipt-offload=y +CONFIG_PACKAGE_kmod-fast-classifier=y CONFIG_DROPBEAR_ECC=y CONFIG_DROPBEAR_ECC_FULL=y diff --git a/r2s.config.seed b/r2s.config.seed index 16796a4..d0624d0 100644 --- a/r2s.config.seed +++ b/r2s.config.seed @@ -73,6 +73,8 @@ CONFIG_PACKAGE_iptables-mod-conntrack-extra=y CONFIG_PACKAGE_iptables-mod-ipopt=y CONFIG_PACKAGE_iptables-mod-tproxy=y CONFIG_PACKAGE_kmod-tcp-bbr=y +CONFIG_PACKAGE_kmod-ipt-offload=y +CONFIG_PACKAGE_kmod-fast-classifier=y CONFIG_DROPBEAR_ECC=y CONFIG_DROPBEAR_ECC_FULL=y diff --git a/r4s.config.seed b/r4s.config.seed index a3dea8e..b411f9d 100644 --- a/r4s.config.seed +++ b/r4s.config.seed @@ -73,6 +73,8 @@ CONFIG_PACKAGE_iptables-mod-conntrack-extra=y CONFIG_PACKAGE_iptables-mod-ipopt=y CONFIG_PACKAGE_iptables-mod-tproxy=y CONFIG_PACKAGE_kmod-tcp-bbr=y +CONFIG_PACKAGE_kmod-ipt-offload=y +CONFIG_PACKAGE_kmod-fast-classifier=y CONFIG_DROPBEAR_ECC=y CONFIG_DROPBEAR_ECC_FULL=y diff --git a/scripts/autoupdate.sh b/scripts/autoupdate.sh index 9d64e46..db1d552 100644 --- a/scripts/autoupdate.sh +++ b/scripts/autoupdate.sh @@ -34,6 +34,7 @@ else fi fi +sed -i 's/-slim//' md5sum.txt if [ `md5sum -c md5sum.txt|grep -c "OK"` -eq 0 ]; then echo -e '\e[91m固件HASH值匹配失败,脚本退出\e[0m' exit 1 @@ -53,8 +54,10 @@ echo -e '\e[92m解压已完成,准备编辑镜像文件,写入备份信息\e cd /mnt/img sysupgrade -b back.tar.gz tar zxf back.tar.gz -echo -e '\e[91m注意:由于已知的问题,“网络接口”配置无法继承,重启后需要重新设置WAN拨号和LAN网段信息\e[0m' -if ! grep -q macaddr /etc/config/network; then rm etc/config/network; fi +if ! grep -q macaddr /etc/config/network; then + echo -e '\e[91m注意:由于已知的问题,“网络接口”配置无法继承,重启后需要重新设置WAN拨号和LAN网段信息\e[0m' + rm etc/config/network; +fi echo -e '\e[92m备份文件已经写入,移除挂载\e[0m' #rm back.tar.gz cd /tmp/upg