diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2012-12-04 14:54:05 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2012-12-04 14:54:05 +0000 |
| commit | 3690ce481b93b839087034588485eebb0ae38fe6 (patch) | |
| tree | bf7a9c9ba761577212e0759c4697ecc7065ed08a | |
| parent | 5feaebe9a97d65e00b29a19e4629b02e48197719 (diff) | |
| download | acf-alpine-baselayout-3690ce481b93b839087034588485eebb0ae38fe6.tar.bz2 acf-alpine-baselayout-3690ce481b93b839087034588485eebb0ae38fe6.tar.xz | |
Fix ifup / ifdown to capture the output
| -rw-r--r-- | interfaces-controller.lua | 4 | ||||
| -rw-r--r-- | interfaces-model.lua | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/interfaces-controller.lua b/interfaces-controller.lua index c27b732..704cb26 100644 --- a/interfaces-controller.lua +++ b/interfaces-controller.lua @@ -20,11 +20,11 @@ delete = function(self) end ifup = function(self) - return self.handle_form(self, self.model.get_ifup_by_name, self.model.ifup_by_name, self.clientdata, "ifup", "Interface Up", "Interface up") + return self.handle_form(self, self.model.get_ifup_by_name, self.model.ifup_by_name, self.clientdata, "ifup", "Interface Up") end ifdown = function(self) - return self.handle_form(self, self.model.get_ifdown_by_name, self.model.ifdown_by_name, self.clientdata, "ifdown", "Interface Down", "Interface down") + return self.handle_form(self, self.model.get_ifdown_by_name, self.model.ifdown_by_name, self.clientdata, "ifdown", "Interface Down") end -- FIXME: 'Method' select box appeared via JS ... figure out how best to implement that when using the standard view 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 |