Merge remote-tracking branch 'upstream/master'

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

diff --git a/components/9990-main.sh b/components/9990-main.sh
index 4a22909..b0e2a7b 100755 (executable)
--- a/components/9990-main.sh
+++ b/components/9990-main.sh
@@ -33,7 +33,7 @@ Live ()
        # Needed here too because some things (*cough* udev *cough*)
        # changes the timeout
 
-       if [ ! -z "${NETBOOT}" ] || [ ! -z "${FETCH}" ] || [ ! -z "${HTTPFS}" ] || [ ! -z "${FTPFS}" ]
+       if [ -n "${NETBOOT}" ] || [ -n "${FETCH}" ] || [ -n "${HTTPFS}" ] || [ -n "${FTPFS}" ]
        then
                if do_netmount
                then
@@ -52,7 +52,7 @@ Live ()
                else
                        if [ -x /usr/bin/memdiskfind ]
                        then
-                               if ! MEMDISK=$(/usr/bin/memdiskfind)
+                               if MEMDISK=$(/usr/bin/memdiskfind)
                                then
                                        # We found a memdisk, set up phram
                                        # Sometimes "modprobe phram" can not successfully create /dev/mtd0.
@@ -205,10 +205,15 @@ Live ()
        mount --rbind /run/live "${rootmnt}/lib/live/mount"
 
        Fstab
-       Netbase
 
        Swap
 
+       if grep -q debian_networking /proc/cmdline ; then
+               Netbase
+       else
+               Grml_Networking
+       fi
+
        exec 1>&6 6>&-
        exec 2>&7 7>&-
        kill ${tailpid}