From 3690ce481b93b839087034588485eebb0ae38fe6 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Tue, 4 Dec 2012 14:54:05 +0000 Subject: Fix ifup / ifdown to capture the output --- interfaces-model.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'interfaces-model.lua') 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 -- cgit v1.2.3