X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=f33ece7520ef3d20a14871006426f40da909f129;hb=81f5b4978b7062df5193871c1087419dce294991;hp=683afa2a8b2e924868c050ac889a37dc11d063dc;hpb=db1fd6b2eda4f4591318263ab17df7d1f273587a;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 683afa2..f33ece7 100755
--- a/scripts/live
+++ b/scripts/live
@@ -927,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}" ]
@@ -1286,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"
@@ -1408,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