Merge branch 'master' into 'master'

Fix flipped logic for handling memdiskfind

See merge request live-team/live-boot!28

diff --git a/components/9990-main.sh b/components/9990-main.sh
index 4a22909..b50952f 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.