X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fadmin-full%2Fluasrc%2Fmodel%2Fcbi%2Fadmin_system%2Ffstab.lua;h=aa4f12e554ce979e207a7869bd3e977a8702944b;hb=8fcd841aa9af96c8a4a4d3c1a555d2d1ed42332c;hp=1e2a12fec168bbd1116c7ba04d8c37df63ef595a;hpb=e9e22aca73d27410572871ae2870c41b96b11a8a;p=project%2Fluci.git

diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua b/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua
index 1e2a12fec1..aa4f12e554 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua
@@ -13,16 +13,18 @@ $Id$
 ]]--
 require("luci.tools.webadmin")
 
-local fs = require "luci.fs"
+local fs   = require "nixio.fs"
+local util = require "nixio.util"
+
 local devices = {}
-luci.util.update(devices, fs.glob("/dev/sd*") or {})
-luci.util.update(devices, fs.glob("/dev/hd*") or {})
-luci.util.update(devices, fs.glob("/dev/scd*") or {})
-luci.util.update(devices, fs.glob("/dev/mmc*") or {})
+util.consume((fs.glob("/dev/sd*")), devices)
+util.consume((fs.glob("/dev/hd*")), devices)
+util.consume((fs.glob("/dev/scd*")), devices)
+util.consume((fs.glob("/dev/mmc*")), devices)
 
 local size = {}
 for i, dev in ipairs(devices) do
-	local s = tonumber((luci.fs.readfile("/sys/class/block/%s/size" % dev:sub(6))))
+	local s = tonumber((fs.readfile("/sys/class/block/%s/size" % dev:sub(6))))
 	size[dev] = s and math.floor(s / 2048)
 end