From: Harald Hoyer <harald@redhat.com>
Date: Fri, 9 Oct 2015 09:35:43 +0000 (+0200)
Subject: network/ifup.sh: skip empty nameserver values
X-Git-Tag: 044~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b43377d74967bd445fe9c0e06d928194b800dd5;p=thirdparty%2Fdracut.git

network/ifup.sh: skip empty nameserver values

(cherry picked from commit e65825117377a8e1e730912aa4c0e786122d892a)
---

diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
index 366744f0f..109fb4b77 100755
--- a/modules.d/40network/ifup.sh
+++ b/modules.d/40network/ifup.sh
@@ -313,8 +313,8 @@ fi
 ip=$(getarg ip)
 
 if [ -z "$ip" ]; then
-    namesrv=$(getargs nameserver)
-    for s in $namesrv; do
+    for s in $(getargs nameserver); do
+        [ -n "$s" ] || continue
         echo nameserver $s >> /tmp/net.$netif.resolv.conf
     done
 
@@ -350,8 +350,8 @@ for p in $(getargs ip=); do
     [ "$use_vlan" != 'true' ] && continue
 
     # setup nameserver
-    namesrv="$dns1 $dns2 $(getargs nameserver)"
-    for s in $namesrv; do
+    for s in "$dns1" "$dns2" $(getargs nameserver); do
+        [ -n "$s" ] || continue
         echo nameserver $s >> /tmp/net.$netif.resolv.conf
     done