From bc335781fed770d67eaaa192706d40204454db8f Mon Sep 17 00:00:00 2001 From: ricardopolo Date: Fri, 1 Nov 2019 10:19:48 -0500 Subject: [PATCH] Do not show error on dhcp status --- lib/network.js | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/lib/network.js b/lib/network.js index e56fb97..13b9b32 100644 --- a/lib/network.js +++ b/lib/network.js @@ -326,25 +326,27 @@ function getInterfaceConnectionName(interfaceName) { } function getDHCPstatus(connectionName) { - const cmd = `nmcli connection show "${connectionName}" \| grep ipv4.method;`; - try { - console.log(1); - const result = execSync(cmd).toString(); - console.log(2); - const resultFormat = result.replace(/\s+/g,' ').trim(); - - let dhcStatus = resultFormat.split(" ").slice(1).toString(); - switch (dhcStatus) { - case 'auto': - dhcStatus = true; - break; - - default: - dhcStatus = false; - break; + if(connectionName) { + const cmd = `nmcli connection show "${connectionName}" \| grep ipv4.method;`; + try { + const result = execSync(cmd).toString(); + const resultFormat = result.replace(/\s+/g,' ').trim(); + + let dhcStatus = resultFormat.split(" ").slice(1).toString(); + switch (dhcStatus) { + case 'auto': + dhcStatus = true; + break; + + default: + dhcStatus = false; + break; + } + return dhcStatus; + } catch (e) { + return 'Unknow'; } - return dhcStatus; - } catch (e) { + } else { return 'Unknow'; } }