garypang13 пре 4 година
родитељ
комит
092458227e
2 измењених фајлова са 12 додато и 4 уклоњено
  1. 0 1
      devices/common/diy.sh
  2. 12 3
      devices/common/patches/disable_rollback.patch

+ 0 - 1
devices/common/diy.sh

@@ -44,7 +44,6 @@ sed -i 's/+python\( \|$\)/+python3/g' package/*/*/*/Makefile
 sed -i 's?../../lang?$(TOPDIR)/feeds/packages/lang?g' package/feeds/custom/*/Makefile
 sed -i 's/PKG_BUILD_DIR:=/PKG_BUILD_DIR?=/g' feeds/luci/luci.mk
 sed -i 's?admin/status/channel_analysis??' package/feeds/luci/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json
-sed -i '/killall -HUP/d' feeds/luci/luci.mk
 find package target -name inittab | xargs -i sed -i "s/askfirst/respawn/g" {}
 for ipk in $(find package/feeds/custom/* -maxdepth 0); do
 	if [[ ! -d "$ipk/patches" && ! "$(grep "codeload.github.com" $ipk/Makefile)" ]]; then

+ 12 - 3
devices/common/patches/disable_rollback.patch

@@ -1,6 +1,6 @@
---- a/package/feeds/luci/luci-base/htdocs/luci-static/resources/luci.js
-+++ b/package/feeds/luci/luci-base/htdocs/luci-static/resources/luci.js
-@@ -2176,7 +2176,7 @@
+--- a/modules/luci-base/htdocs/luci-static/resources/luci.js
++++ b/modules/luci-base/htdocs/luci-static/resources/luci.js
+@@ -2177,7 +2177,7 @@
  			if (!hasmap)
  				readonly = !LuCI.prototype.hasViewPermission();
  
@@ -9,3 +9,12 @@
  				0: [ _('Save & Apply') ],
  				1: [ _('Apply unchecked') ]
  			}, {
+@@ -2674,7 +2674,7 @@
+ 						class: 'btn primary',
+ 						click: function() {
+ 							var loc = window.location;
+-							window.location = loc.protocol + '//' + loc.host + loc.pathname + loc.search;
++							window.location = loc.protocol + '//' + loc.host;
+ 						}
+ 					}, _('To login…')))
+ 			]);