diff --git a/Configs/x86_64-X b/Configs/x86_64-X index 5d37a9b..87e9fa4 100644 --- a/Configs/x86_64-X +++ b/Configs/x86_64-X @@ -122,7 +122,7 @@ CONFIG_PACKAGE_luci-app-nfs=y CONFIG_PACKAGE_luci-app-npc=y CONFIG_PACKAGE_luci-app-openclash=y CONFIG_PACKAGE_luci-app-onliner=y -CONFIG_PACKAGE_luci-app-passwall=y +CONFIG_PACKAGE_luci-app-passwall2=y CONFIG_PACKAGE_luci-app-pptp-server=y CONFIG_PACKAGE_luci-app-qbittorrent=y # CONFIG_PACKAGE_luci-app-qbittorrent_dynamic is not set diff --git a/Configs/x86_64-Y b/Configs/x86_64-Y index a74269b..f8cd133 100644 --- a/Configs/x86_64-Y +++ b/Configs/x86_64-Y @@ -13,7 +13,7 @@ CONFIG_PACKAGE_luci-theme-argon-mod=y CONFIG_PACKAGE_luci-theme-neobird=y CONFIG_PACKAGE_luci-theme-edge=y # passwall -CONFIG_PACKAGE_luci-app-passwall=y +CONFIG_PACKAGE_luci-app-passwall2=y # Adguard Home CONFIG_PACKAGE_luci-app-adguardhome=y CONFIG_PACKAGE_adguardhome=y diff --git a/Configs/x86_64-Z b/Configs/x86_64-Z index bace4de..814128f 100644 --- a/Configs/x86_64-Z +++ b/Configs/x86_64-Z @@ -18,7 +18,7 @@ CONFIG_PACKAGE_luci-theme-edge=y CONFIG_PACKAGE_luci-theme-argon-mod=y CONFIG_PACKAGE_luci-theme-neobird=y # passwall -CONFIG_PACKAGE_luci-app-passwall=y +CONFIG_PACKAGE_luci-app-passwall2=y # Adguard Home CONFIG_PACKAGE_luci-app-adguardhome=y CONFIG_PACKAGE_adguardhome=y diff --git a/Scripts/AutoBuild_DiyScript.sh b/Scripts/AutoBuild_DiyScript.sh index 2989e88..75c4b44 100755 --- a/Scripts/AutoBuild_DiyScript.sh +++ b/Scripts/AutoBuild_DiyScript.sh @@ -66,7 +66,7 @@ then fi exit 0 EOF - sed -i "s?/bin/login?/usr/libexec/login.sh?g" ${FEEDS_PKG}/ttyd/files/ttyd.config + # sed -i "s?/bin/login?/usr/libexec/login.sh?g" ${FEEDS_PKG}/ttyd/files/ttyd.config # sed -i 's/luci-theme-bootstrap/luci-theme-argon-mod/g' feeds/luci/collections/luci/Makefile # sed -i '/uci commit luci/i\uci set luci.main.mediaurlbase="/luci-static/argon-mod"' $(PKG_Finder d package default-settings)/files/zzz-default-settings @@ -115,6 +115,7 @@ EOF Copy ${CustomFiles}/Depends/cpuset ${BASE_FILES}/bin AddPackage git passwall-depends openwrt-passwall-packages xiaorouji main AddPackage git passwall-luci openwrt-passwall xiaorouji main + AddPackage git passwall2-luci openwrt-passwall2 xiaorouji main AddPackage git other luci-app-dockerman lisaac master rm -rf packages/lean/autocore # May Can Delete AddPackage git lean autocore-modify xopenwrt master @@ -128,7 +129,7 @@ EOF esac ;; immortalwrt/immortalwrt*) - sed -i "s?/bin/login?/usr/libexec/login.sh?g" ${FEEDS_PKG}/ttyd/files/ttyd.config + # sed -i "s?/bin/login?/usr/libexec/login.sh?g" ${FEEDS_PKG}/ttyd/files/ttyd.config ;; esac }