diff --git a/.github/workflows/r2s_lienol_from_lean.yml b/.github/workflows/r2s_lienol_from_lean.yml index 5201e40..9902edd 100644 --- a/.github/workflows/r2s_lienol_from_lean.yml +++ b/.github/workflows/r2s_lienol_from_lean.yml @@ -70,6 +70,7 @@ jobs: CONFIG_PACKAGE_luci-app-frpc=y CONFIG_PACKAGE_luci-app-netdata=y CONFIG_LIBSODIUM_MINIMAL=y + CONFIG_PACKAGE_luci-app-ssr-plus=y CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_DNS2SOCKS=y CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Redsocks2=y CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Shadowsocks=y @@ -94,6 +95,11 @@ jobs: CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Trojan=y CONFIG_PACKAGE_luci-app-passwall_INCLUDE_simple-obfs=y CONFIG_PACKAGE_luci-app-passwall_INCLUDE_v2ray-plugin=y + # CONFIG_PACKAGE_luci-app-pppoe-relay is not set + # CONFIG_PACKAGE_luci-app-pppoe-server is not set + # CONFIG_PACKAGE_luci-app-pptp-vpnserver-manyusers is not set + # CONFIG_PACKAGE_luci-app-ssr-python-pro-server is not set + # CONFIG_PACKAGE_luci-app-v2ray-server is not set # CONFIG_PACKAGE_iptables-mod-conntrack-extra is not set # CONFIG_PACKAGE_iptables-mod-ipopt is not set # CONFIG_PACKAGE_kmod-crypto-authenc is not set diff --git a/JUNK/flash.sh b/JUNK/flash.sh index 36d8e67..4369bd7 100755 --- a/JUNK/flash.sh +++ b/JUNK/flash.sh @@ -1,11 +1,16 @@ #!/bin/ash if ! type "pv" > /dev/null; then -opkg update ; opkg install pv -fi -if [ -f /tmp/upload/rom.img.gz ]; then -pv /tmp/upload/rom.img.gz | gunzip -dc > /dev/mmcblk0 -echo 1 > /proc/sys/kernel/sysrq -echo b > /proc/sysrq-trigger + opkg update ; opkg install pv + if ! type "pv" > /dev/null; then + echo 'pv安装失败,退出...' + exit 1 + fi +fi + +if [ -f /tmp/upload/rom.img.gz ]; then + pv /tmp/upload/rom.img.gz | gunzip -dc > /dev/mmcblk0 + echo 1 > /proc/sys/kernel/sysrq + echo b > /proc/sysrq-trigger fi