Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-mod-failsafe: switch to nixio.fs

Browse source 
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
This commit is contained in:
Jo-Philipp Wich 2015-01-15 15:40:05 +01:00
parent b7f80a98d8
commit 6cc1ae506c
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/luci-mod-failsafe/luasrc/controller/failsafe/failsafe.lua
View file

@ -43,9 +43,9 @@ end
function action_flashops() function action_flashops()
local sys = require "luci.sys" local sys = require "luci.sys"
local fs = require "luci.fs" local fs = require "nixio.fs"
local upgrade_avail = nixio.fs.access("/lib/upgrade/platform.sh") local upgrade_avail = fs.access("/lib/upgrade/platform.sh")
local reset_avail = os.execute([[grep '"rootfs_data"' /proc/mtd >/dev/null 2>&1]]) == 0 local reset_avail = os.execute([[grep '"rootfs_data"' /proc/mtd >/dev/null 2>&1]]) == 0
local image_tmp = "/tmp/firmware.img" local image_tmp = "/tmp/firmware.img"
@ -66,7 +66,7 @@ function action_flashops()
local function storage_size() local function storage_size()
local size = 0 local size = 0
if nixio.fs.access("/proc/mtd") then if fs.access("/proc/mtd") then
for l in io.lines("/proc/mtd") do for l in io.lines("/proc/mtd") do
local d, s, e, n = l:match('^([^%s]+)%s+([^%s]+)%s+([^%s]+)%s+"([^%s]+)"') local d, s, e, n = l:match('^([^%s]+)%s+([^%s]+)%s+([^%s]+)%s+"([^%s]+)"')
if n == "linux" or n == "firmware" then if n == "linux" or n == "firmware" then
@ -74,7 +74,7 @@ function action_flashops()
break break
end end
end end
elseif nixio.fs.access("/proc/partitions") then elseif fs.access("/proc/partitions") then
for l in io.lines("/proc/partitions") do for l in io.lines("/proc/partitions") do
local x, y, b, n = l:match('^%s*(%d+)%s+(%d+)%s+([^%s]+)%s+([^%s]+)') local x, y, b, n = l:match('^%s*(%d+)%s+(%d+)%s+([^%s]+)%s+([^%s]+)')
if b and n and not n:match('[0-9]') then if b and n and not n:match('[0-9]') then
@ -114,11 +114,11 @@ function action_flashops()
luci.template.render("failsafe/upgrade", { luci.template.render("failsafe/upgrade", {
checksum = image_checksum(), checksum = image_checksum(),
storage = storage_size(), storage = storage_size(),
size = nixio.fs.stat(image_tmp).size, size = (fs.stat(image_tmp, "size") or 0),
keep = false keep = false
}) })
else else
nixio.fs.unlink(image_tmp) fs.unlink(image_tmp)
luci.template.render("failsafe/flashops", { luci.template.render("failsafe/flashops", {
reset_avail = reset_avail, reset_avail = reset_avail,
upgrade_avail = upgrade_avail, upgrade_avail = upgrade_avail,