Merge "Handle unconfigured interfaces for dhcp-all-ifaces"

2016-04-21 05:23:37 +00:00 · 2016-04-21 05:23:37 +00:00 · 45afd99012
commit 45afd99012
parent 874fef9fe9 6bdb810f38
1 changed files with 9 additions and 1 deletions
--- a/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.sh
+++ b/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.sh
@ -56,7 +56,15 @@ function config_exists() {
            return 0
        fi
    else
-        ifquery $interface >/dev/null 2>&1 && return 0 || return 1
+        if ifquery $interface >/dev/null 2>&1; then
+            if [ -z "$(ifquery $interface 2>&1)" ]; then
+                return 1
+            else
+                return 0
+            fi
+        else
+            return 1
+        fi
    fi
    return 1
 }