diff options
| author | Steven Barth <steven@midlink.org> | 2008-08-15 00:44:13 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2008-08-15 00:44:13 +0000 |
| commit | 72b500bee7e94da06faf15b3dfec9296404612ba (patch) | |
| tree | a4dd672550d11913a1ad4a756743683e98a1be5f | |
| parent | a31b38435a8abca5c3122a34393ef909c7a2239e (diff) | |
modules/*: Reintroduced the broadcom sanity check
| -rw-r--r-- | modules/admin-full/luasrc/controller/admin/system.lua | 5 | ||||
| -rw-r--r-- | modules/admin-mini/luasrc/controller/mini/system.lua | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua index cdf7ee2c6..4303d86eb 100644 --- a/modules/admin-full/luasrc/controller/admin/system.lua +++ b/modules/admin-full/luasrc/controller/admin/system.lua @@ -184,8 +184,9 @@ function action_upgrade() local ret = nil local plat = luci.fs.mtime("/lib/upgrade/platform.sh") local tmpfile = "/tmp/firmware.img" - - local keep_avail = true + local broadcom = os.execute('grep brcm_ /lib/upgrade/platform.sh >/dev/null 2>&1') == 0 + + local keep_avail = not broadcom 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 60f29323d..255e26f65 100644 --- a/modules/admin-mini/luasrc/controller/mini/system.lua +++ b/modules/admin-mini/luasrc/controller/mini/system.lua @@ -82,8 +82,9 @@ function action_upgrade() local ret = nil local plat = luci.fs.mtime("/lib/upgrade/platform.sh") local tmpfile = "/tmp/firmware.img" - - local keep_avail = true + local broadcom = os.execute('grep brcm_ /lib/upgrade/platform.sh >/dev/null 2>&1') == 0 + + local keep_avail = not broadcom local file luci.http.setfilehandler( |