Add back persistance fsck option

[live-boot-grml.git] / components / 9990-networking.sh

diff --git a/components/9990-networking.sh b/components/9990-networking.sh
index dbdc913..dd1d0f0 100755 (executable)
--- a/components/9990-networking.sh
+++ b/components/9990-networking.sh
@@ -107,7 +107,7 @@ do_netsetup ()
                        # if configuration of device worked we should have an assigned
                        # IP address, if so let's use the device as $DEVICE for later usage.
                        # simple and primitive approach which seems to work fine
-                       if ifconfig $dev | grep -q 'inet.*addr:'
+                       if ifconfig $dev | grep -q -E 'inet.*addr:|inet [0-9][0-9]*.[0-9][0-9]*.[0-9][0-9]*.[0-9][0-9]*'
                        then
                                export DEVICE="$dev"
                                break
@@ -151,7 +151,7 @@ do_netsetup ()
                                echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
                        fi
 
-                       for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1}
+                       for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1} ${DNSSERVERS}
                        do
                                if [ -n "$i" ] && [ "$i" != 0.0.0.0 ]
                                then