update

kiddin9 · May 4, 2021 · e7e6c7c · e7e6c7c
1 parent 054ca5b
commit e7e6c7c
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 src="<%=media%>/background/3.jpg" alt="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
@@ -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(){