summaryrefslogtreecommitdiffstats
path: root/interfaces-model.lua
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2012-12-04 14:54:05 +0000
committerTed Trask <ttrask01@yahoo.com>2012-12-04 14:54:05 +0000
commit3690ce481b93b839087034588485eebb0ae38fe6 (patch)
treebf7a9c9ba761577212e0759c4697ecc7065ed08a /interfaces-model.lua
parent5feaebe9a97d65e00b29a19e4629b02e48197719 (diff)
downloadacf-alpine-baselayout-3690ce481b93b839087034588485eebb0ae38fe6.tar.bz2
acf-alpine-baselayout-3690ce481b93b839087034588485eebb0ae38fe6.tar.xz
Fix ifup / ifdown to capture the output
Diffstat (limited to 'interfaces-model.lua')
-rw-r--r--interfaces-model.lua16
1 files changed, 8 insertions, 8 deletions
diff --git a/interfaces-model.lua b/interfaces-model.lua
index 5514ae0..c524adb 100644
--- a/interfaces-model.lua
+++ b/interfaces-model.lua
@@ -486,12 +486,12 @@ end
ifup_by_name = function (self, ifuprequest)
name = ifuprequest.value.iface.value or ""
- local cmd = path.."ifup "..name
- local f = io.popen(format.escapespecialcharacters(cmd))
- local cmdresult = f:read("*a")
+ local cmd = path.."ifup "..format.escapespecialcharacters(name).." 2>&1"
+ local f = io.popen(cmd)
+ ifuprequest.descr = f:read("*a")
f:close()
- if cmdresult == "" then
+ if ifuprequest.descr == "" then
ifuprequest.descr = "Interface up"
end
@@ -507,12 +507,12 @@ end
ifdown_by_name = function (self, ifdownrequest)
name = ifdownrequest.value.iface.value or ""
- local cmd = path.."ifdown "..name
- local f = io.popen(format.escapespecialcharacters(cmd))
- local cmdresult = f:read("*a")
+ local cmd = path.."ifdown "..format.escapespecialcharacters(name).." 2>&1"
+ local f = io.popen(cmd)
+ ifdownrequest.descr = f:read("*a")
f:close()
- if cmdresult == "" then
+ if ifdownrequest.descr == "" then
ifdownrequest.descr = "Interface down"
end