diff options
| author | Steven Barth <steven@midlink.org> | 2008-09-12 13:32:35 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2008-09-12 13:32:35 +0000 |
| commit | df723f9d9e858d56cdf4cd2fee15e1549a353ad0 (patch) | |
| tree | 087cf61874c341076396ad99b309055d32fec86a | |
| parent | bf7287c60d3819ee2322c47d191d01e55a1ec909 (diff) | |
Avoid some blocking issues
| -rw-r--r-- | libs/sgi-cgi/luasrc/sgi/cgi.lua | 1 | ||||
| -rw-r--r-- | libs/sys/luasrc/sys.lua | 14 |
2 files changed, 3 insertions, 12 deletions
diff --git a/libs/sgi-cgi/luasrc/sgi/cgi.lua b/libs/sgi-cgi/luasrc/sgi/cgi.lua index d36d43fb51..f78adeaed6 100644 --- a/libs/sgi-cgi/luasrc/sgi/cgi.lua +++ b/libs/sgi-cgi/luasrc/sgi/cgi.lua @@ -61,6 +61,7 @@ function run() elseif id == 4 then io.write(data1) elseif id == 5 then + io.close() active = false end end diff --git a/libs/sys/luasrc/sys.lua b/libs/sys/luasrc/sys.lua index 02cea5e91d..cf7fbc05f8 100644 --- a/libs/sys/luasrc/sys.lua +++ b/libs/sys/luasrc/sys.lua @@ -67,7 +67,7 @@ function flash(image, kpattern) if kpattern then cmd = cmd .. "-k '" .. kpattern:gsub("'", "") .. "' " end - cmd = cmd .. "'" .. image:gsub("'", "") .. "' 2>/dev/null" + cmd = cmd .. "'" .. image:gsub("'", "") .. "' 2>/dev/null &" local fp = io.popen(cmd) fp:setvbuf("no") @@ -78,18 +78,8 @@ function flash(image, kpattern) fp:close() return false, line else - line = fp:read() - if line == "Performing system upgrade..." then - return true - end - - line = fp:read() - if line == "Performing system upgrade..." then - return true - end - fp:close() - return false, line + return true end end |