Adding missing pipe in cryptsetup call for persistency on luks partitions.

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

diff --git a/scripts/live b/scripts/live
index ef7f64d..f33ece7 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -773,9 +773,11 @@ do_httpmount ()
                                        then
                                                case "$url" in
                                                        tftp*)
-                                                               ip="$(dirname $url | sed -e 's|tftp://||g')"
-                                                               log_begin_msg "Trying tftp -g -b 10240 -r $(basename ${url})  -l ${dest}/$(basename ${url}) $ip"
-                                                               tftp -g -b 10240 -r $(basename ${url})  -l ${dest}/$(basename ${url}) $ip
+                                                               ip="$(dirname $url | sed -e 's|tftp://||g' -e 's|/.*$||g')"
+                                                               rfile="$(echo $url | sed -e "s|tftp://$ip||g")"
+                                                               lfile="$(basename $url)"
+                                                               log_begin_msg "Trying tftp -g -b 10240 -r $rfile -l ${dest}/$lfile $ip"
+                                                               tftp -g -b 10240 -r $rfile -l ${dest}/$lfile $ip
                                                        ;;
 
                                                        *)
@@ -925,7 +927,7 @@ find_snap ()
        if [ "${PERSISTENT}" != "nofiles" ]
        then
                # search for image files
-               snapdata=$(find_files "${snap_label}.squashfs ${snap_label}.cpio.gz ${snap_label}.ext2 ${snap_label}.ext3 ${snal_label}.ext4 ${snap_label}.jffs2")
+               snapdata=$(find_files "${snap_label}.squashfs ${snap_label}.cpio.gz ${snap_label}.ext2 ${snap_label}.ext3 ${snap_label}.ext4 ${snap_label}.jffs2")
        fi
 
        if [ -z "${snapdata}" ]
@@ -944,7 +946,7 @@ try_snap ()
        snap_mount="${2}"
        snap_type="${3}"
 
-       if [ ! -z "${snapdata}" ]
+       if [ -n "${snapdata}" ] && [ ! -b "${snapdata}" ]
        then
                log_success_msg "found snapshot: ${snapdata}"
                snapdev="$(echo ${snapdata} | cut -f1 -d ' ')"
@@ -983,12 +985,11 @@ try_snap ()
                        log_warning_msg "Impossible to include the ${snapfile} Snapshot file"
                fi
 
-
        elif [ -b "${snapdata}" ]
        then
                # Try to find if it could be a snapshot partition
                dev="${snapdata}"
-               log_success_msg "found snapshot device on ${dev}"
+               log_success_msg "found snapshot ${snap_type} device on ${dev}"
                if echo "${dev}" | grep -qs loop
                then
                        # strange things happens, user confused?
@@ -1285,6 +1286,9 @@ setup_unionfs ()
                        ${rootmnt} failed with option noatime,dirs=/cow=rw:${rofsstring}"
        fi
 
+       # Correct the permissions of /:
+       chmod 0755 "${rootmnt}"
+
        # tmpfs file systems
        touch /etc/fstab
        mkdir -p "${rootmnt}/live"
@@ -1407,7 +1411,8 @@ find_livefs ()
                        do
                                if [ "$(cat ${sysblock}/removable)" = "1" ]
                                then
-                                       if readlink ${sysblock}/device | grep -q usb
+                                       if readlink ${sysblock} | grep -q usb ||
+                                          readlink ${sysblock}/device | grep -q usb # linux < 2.6.29
                                        then
                                                for dev in $(subdevices "${sysblock}")
                                                do