From d1998ce92433d5be73ce9895b2b772dbec3f4c1d Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Sat, 9 Aug 2008 00:42:35 +0000 Subject: [PATCH] Added missing dependency which broke LuCI Removed unneeded Broadcom sanity check --- contrib/package/luci/Makefile | 2 +- modules/admin-full/luasrc/controller/admin/system.lua | 3 +-- modules/admin-mini/luasrc/controller/mini/system.lua | 3 +-- 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( -- 2.11.0