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

diff --git a/scripts/live b/scripts/live
index 4a793ad..f33ece7 100755
--- 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}" ]
@@ -1284,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"
@@ -1406,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