From 2bbc4eb3c33c3590433174c599ec9418bdb8f38a Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Fri, 12 Sep 2008 16:12:23 +0000 Subject: Revert "Redesigned firmware upgrade process" --- libs/sys/luasrc/sys.lua | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'libs/sys/luasrc') diff --git a/libs/sys/luasrc/sys.lua b/libs/sys/luasrc/sys.lua index cf7fbc05f..e27e1c4e8 100644 --- a/libs/sys/luasrc/sys.lua +++ b/libs/sys/luasrc/sys.lua @@ -60,27 +60,15 @@ exec = luci.util.exec --- Invoke the luci-flash executable to write an image to the flash memory. -- @param image Local path or URL to image file -- @param kpattern Pattern of files to keep over flash process --- @return boolean indicating status --- @return error message if any +-- @return Return value of os.execute() function flash(image, kpattern) local cmd = "luci-flash " if kpattern then cmd = cmd .. "-k '" .. kpattern:gsub("'", "") .. "' " end - cmd = cmd .. "'" .. image:gsub("'", "") .. "' 2>/dev/null &" + cmd = cmd .. "'" .. image:gsub("'", "") .. "' >/dev/null 2>&1" - local fp = io.popen(cmd) - fp:setvbuf("no") - - local line = fp:read() - - if line == "Invalid image type" then - fp:close() - return false, line - else - fp:close() - return true - end + return os.execute(cmd) end --- Retrieve information about currently mounted file systems. -- cgit v1.2.3