From e7e6c7c949511134ad0dba5b63b3678c96f350a5 Mon Sep 17 00:00:00 2001 From: garypang13 <48883331+garypang13@users.noreply.github.com> Date: Wed, 5 May 2021 04:11:14 +0800 Subject: [PATCH] update --- devices/XY-C5/patches/natflow.patch | 12 ++++++++++++ devices/common/.config | 11 ----------- devices/common/default-settings | 3 +++ devices/k2p-32m-usb/patches/natflow.patch | 12 ++++++++++++ devices/phicomm-k2p/diy.sh | 1 + devices/phicomm-k2p/patches/natflow.patch | 12 ++++++++++++ 6 files changed, 40 insertions(+), 11 deletions(-) diff --git a/devices/XY-C5/patches/natflow.patch b/devices/XY-C5/patches/natflow.patch index c6f392c7363d..61be521d6f8e 100644 --- a/devices/XY-C5/patches/natflow.patch +++ b/devices/XY-C5/patches/natflow.patch @@ -10,6 +10,18 @@ local function bbr_status() +--- a/package/feeds/custom/luci-app-turboacc/luasrc/model/cbi/turboacc.lua ++++ b/package/feeds/custom/luci-app-turboacc/luasrc/model/cbi/turboacc.lua +@@ -10,7 +10,7 @@ s = m:section(TypedSection, "turboacc", "") + s.addremove = false + s.anonymous = true + +-if nixio.fs.access("/lib/modules/" .. kernel_version .. "/xt_FLOWOFFLOAD.ko") then ++if nixio.fs.access("/lib/modules/" .. kernel_version .. "/natflow.ko") then + sw_flow = s:option(Flag, "sw_flow", translate("Software flow offloading")) + sw_flow.default = 0 + sw_flow.description = translate("Software based offloading for routing/NAT") + --- a/package/feeds/custom/luci-app-turboacc/root/etc/init.d/turboacc +++ b/package/feeds/custom/luci-app-turboacc/root/etc/init.d/turboacc @@ -21,7 +21,7 @@ inital_conf(){ diff --git a/devices/common/.config b/devices/common/.config index 6f46b3f8438a..6135546d6cb2 100644 --- a/devices/common/.config +++ b/devices/common/.config @@ -17,17 +17,6 @@ CONFIG_PACKAGE_luci-app-firewall=y CONFIG_PACKAGE_luci-app-gpsysupgrade=y CONFIG_PACKAGE_luci-app-opkg=y CONFIG_PACKAGE_luci-app-bypass=y -CONFIG_PACKAGE_luci-app-bypass_INCLUDE_V2ray_plugin=n -CONFIG_PACKAGE_luci-app-bypass_INCLUDE_V2ray=n -CONFIG_PACKAGE_luci-app-bypass_INCLUDE_Xray=y -CONFIG_PACKAGE_luci-app-bypass_INCLUDE_Trojan=y -CONFIG_PACKAGE_luci-app-bypass_INCLUDE_Trojan-Go=y -CONFIG_PACKAGE_luci-app-bypass_INCLUDE_NaiveProxy=n -CONFIG_PACKAGE_luci-app-bypass_INCLUDE_Kcptun=n -CONFIG_PACKAGE_luci-app-bypass_INCLUDE_Shadowsocks_Server=n -CONFIG_PACKAGE_luci-app-bypass_INCLUDE_ShadowsocksR_Server=n -CONFIG_PACKAGE_luci-app-bypass_INCLUDE_Simple_obfs_server=n -CONFIG_PACKAGE_luci-app-bypass_INCLUDE_Socks_Server=y CONFIG_PACKAGE_luci-app-upnp=y CONFIG_PACKAGE_luci-app-autoreboot=y CONFIG_PACKAGE_luci-app-nft-qos=y diff --git a/devices/common/default-settings b/devices/common/default-settings index df063c661050..19ec4e909d4b 100644 --- a/devices/common/default-settings +++ b/devices/common/default-settings @@ -32,6 +32,9 @@ ln -s /sbin/poweroff /sbin/shutdown sed -i '/S99opkg/d' /etc/crontabs/root echo "0 4 * * * sh /etc/rc.d/S99opkg >/tmp/opkgupdate.log 2>&1" >> /etc/crontabs/root +cpuinfo=`/sbin/cpuinfo` +test -n "$cpuinfo" && sed -i "s/_('CPU Info'),cpuinfo.cpufreq,//" /www/luci-static/resources/view/status/include/10_system.js + test $version -lt 1 && { uci set luci.main.lang='auto' uci set luci.main.mediaurlbase=/luci-static/edge diff --git a/devices/k2p-32m-usb/patches/natflow.patch b/devices/k2p-32m-usb/patches/natflow.patch index c6f392c7363d..61be521d6f8e 100644 --- a/devices/k2p-32m-usb/patches/natflow.patch +++ b/devices/k2p-32m-usb/patches/natflow.patch @@ -10,6 +10,18 @@ local function bbr_status() +--- a/package/feeds/custom/luci-app-turboacc/luasrc/model/cbi/turboacc.lua ++++ b/package/feeds/custom/luci-app-turboacc/luasrc/model/cbi/turboacc.lua +@@ -10,7 +10,7 @@ s = m:section(TypedSection, "turboacc", "") + s.addremove = false + s.anonymous = true + +-if nixio.fs.access("/lib/modules/" .. kernel_version .. "/xt_FLOWOFFLOAD.ko") then ++if nixio.fs.access("/lib/modules/" .. kernel_version .. "/natflow.ko") then + sw_flow = s:option(Flag, "sw_flow", translate("Software flow offloading")) + sw_flow.default = 0 + sw_flow.description = translate("Software based offloading for routing/NAT") + --- a/package/feeds/custom/luci-app-turboacc/root/etc/init.d/turboacc +++ b/package/feeds/custom/luci-app-turboacc/root/etc/init.d/turboacc @@ -21,7 +21,7 @@ inital_conf(){ diff --git a/devices/phicomm-k2p/diy.sh b/devices/phicomm-k2p/diy.sh index b0cacd1dfbf5..826865a24a78 100644 --- a/devices/phicomm-k2p/diy.sh +++ b/devices/phicomm-k2p/diy.sh @@ -3,6 +3,7 @@ rm -Rf files/etc/profile.d/sysinfo.sh sed -i 's/O2/Os/g' include/target.mk +sed -i '//d' package/feeds/luci/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js sed -i '/unsplash.com/d' package/feeds/custom/luci-theme-edge/luasrc/view/themes/edge/sysauth.htm sed -i 's?img??' package/feeds/custom/luci-theme-edge/luasrc/view/themes/edge/sysauth.htm diff --git a/devices/phicomm-k2p/patches/natflow.patch b/devices/phicomm-k2p/patches/natflow.patch index c6f392c7363d..61be521d6f8e 100644 --- a/devices/phicomm-k2p/patches/natflow.patch +++ b/devices/phicomm-k2p/patches/natflow.patch @@ -10,6 +10,18 @@ local function bbr_status() +--- a/package/feeds/custom/luci-app-turboacc/luasrc/model/cbi/turboacc.lua ++++ b/package/feeds/custom/luci-app-turboacc/luasrc/model/cbi/turboacc.lua +@@ -10,7 +10,7 @@ s = m:section(TypedSection, "turboacc", "") + s.addremove = false + s.anonymous = true + +-if nixio.fs.access("/lib/modules/" .. kernel_version .. "/xt_FLOWOFFLOAD.ko") then ++if nixio.fs.access("/lib/modules/" .. kernel_version .. "/natflow.ko") then + sw_flow = s:option(Flag, "sw_flow", translate("Software flow offloading")) + sw_flow.default = 0 + sw_flow.description = translate("Software based offloading for routing/NAT") + --- a/package/feeds/custom/luci-app-turboacc/root/etc/init.d/turboacc +++ b/package/feeds/custom/luci-app-turboacc/root/etc/init.d/turboacc @@ -21,7 +21,7 @@ inital_conf(){