Merge branch 'debian'

[live-boot-grml.git] / scripts / live

diff --git a/scripts/live b/scripts/live
index ad481ae..584193e 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -399,7 +399,7 @@ Arguments ()
        then
                PERSISTENT_ENCRYPTION="none"
                export PERSISTENT_ENCRYPTION
-       elif echo ${PERSISTENT_ENCRYPTION} | grep -qw luks
+       elif echo ${PERSISTENT_ENCRYPTION} | grep -qe "\<luks\>"
        then
                if ! modprobe dm-crypt
                then
@@ -536,7 +536,7 @@ is_nice_device ()
                PATH_ID="/sbin/udevadm test-builtin path_id"
        fi
 
-       if "${PATH_ID}" "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-[^-]*-(ide|sas|scsi|usb|virtio)|platform-sata_mv|platform-orion-ehci|platform-mmc|platform-mxsdhci)"
+       if ${PATH_ID} "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-[^-]*-(ide|sas|scsi|usb|virtio)|platform-sata_mv|platform-orion-ehci|platform-mmc|platform-mxsdhci)"
        then
                return 0
        elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$'
@@ -1403,12 +1403,12 @@ setup_unionfs ()
                                ;;
                esac
 
-               if echo ${PERSISTENT_METHOD} | grep -qw overlay
+               if echo ${PERSISTENT_METHOD} | grep -qe "\<overlay\>"
                then
                        overlays="${root_persistence} ${home_persistence}"
                fi
 
-               if echo ${PERSISTENT_METHOD} | grep -qw snapshot
+               if echo ${PERSISTENT_METHOD} | grep -qe "\<snapshot\>"
                then
                        snapshots="${root_snapshot_label} ${home_snapshot_label}"
                fi
@@ -1952,6 +1952,7 @@ mountroot ()
                                then
                                        # We found a memdisk, set up phram
                                        modprobe phram phram=memdisk,${MEMDISK}
+                                       modprobe phram phram=memdisk,${MEMDISK}
 
                                        # Load mtdblock, the memdisk will be /dev/mtdblock0
                                        modprobe mtdblock