summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-08-09 00:42:35 +0000
committerSteven Barth <steven@midlink.org>2008-08-09 00:42:35 +0000
commitd1998ce92433d5be73ce9895b2b772dbec3f4c1d (patch)
tree7f98daaa6ac5ffdfb2a5b4a87ccf56b60a67ef2c
parentdb8e5858bfd7d5cae17949a977f87289f5b9ac29 (diff)
Added missing dependency which broke LuCI
Removed unneeded Broadcom sanity check
-rw-r--r--contrib/package/luci/Makefile2
-rw-r--r--modules/admin-full/luasrc/controller/admin/system.lua3
-rw-r--r--modules/admin-mini/luasrc/controller/mini/system.lua3
3 files changed, 3 insertions, 5 deletions
diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 5bab3b7cb..a4441de5b 100644
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -100,7 +100,7 @@ endef
define Package/luci-core
$(call Package/luci/libtemplate)
- DEPENDS:=+lua +luaposix
+ DEPENDS:=+lua +luaposix +bitlib
TITLE:=LuCI core libraries
endef
diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua
index 3ebaebcee..fec652699 100644
--- a/modules/admin-full/luasrc/controller/admin/system.lua
+++ b/modules/admin-full/luasrc/controller/admin/system.lua
@@ -243,10 +243,9 @@ function action_upgrade()
local ret = nil
local plat = luci.fs.mtime("/lib/upgrade/platform.sh")
- local broadcom = os.execute('grep brcm_ /lib/upgrade/platform.sh >/dev/null 2>&1') == 0
local tmpfile = "/tmp/firmware.img"
- local keep_avail = not broadcom
+ local keep_avail = true
local file
luci.http.setfilehandler(
diff --git a/modules/admin-mini/luasrc/controller/mini/system.lua b/modules/admin-mini/luasrc/controller/mini/system.lua
index 0df4f8cc4..60f29323d 100644
--- a/modules/admin-mini/luasrc/controller/mini/system.lua
+++ b/modules/admin-mini/luasrc/controller/mini/system.lua
@@ -81,10 +81,9 @@ function action_upgrade()
local ret = nil
local plat = luci.fs.mtime("/lib/upgrade/platform.sh")
- local broadcom = os.execute('grep brcm_ /lib/upgrade/platform.sh >/dev/null 2>&1') == 0
local tmpfile = "/tmp/firmware.img"
- local keep_avail = not broadcom
+ local keep_avail = true
local file
luci.http.setfilehandler(