X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=6777f99772e6dc53a1f5599e19bc3d12648eeed7;hb=6759640353d9896cc0b6d4fe81085a0004d62143;hp=84d460bce61440622630c002877309ee707f5a36;hpb=c56043cfe693915629c2a6eebc5508fc0439f7c2;p=live-boot-grml.git

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 84d460b..6777f99 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -76,16 +76,14 @@ is_supported_fs ()
 
 get_fstype ()
 {
-	# udev >=146-1 no longer provides vol_id:
+	# udev (>= 146) no longer provides vol_id
 	if [ -x /lib/udev/vol_id ]
 	then
+		# lenny
 		/lib/udev/vol_id -t ${1} 2>/dev/null
 	else
-		eval $(blkid -o udev "${1}")
-		if [ -n "$ID_FS_TYPE" ]
-		then
-			echo "${ID_FS_TYPE}"
-		fi
+		# squeeze
+		/sbin/blkid -s TYPE -o value $1 2>/dev/null
 	fi
 }
 
@@ -191,14 +189,7 @@ setup_loop ()
 
 	modprobe -q -b "${module}"
 
-	if [ -x /sbin/udevadm ]
-	then
-		# lenny
-		udevadm settle
-	else
-		# etch
-		udevsettle
-	fi
+	udevadm settle
 
 	for loopdev in ${pattern}
 	do
@@ -287,7 +278,8 @@ try_mount ()
 		then
 			fstype=$(get_fstype "${dev}")
 		fi
-		mount -t "${fstype}" -o "${opts}" "${dev}" "${mountp}" || panic "Cannot mount ${dev} on ${mountp}, fstype=${fstype}, options=${opts}"
+		mount -t "${fstype}" -o "${opts}" "${dev}" "${mountp}" || \
+		( echo "SKIPPING: Cannot mount ${dev} on ${mountp}, fstype=${fstype}, options=${opts}" > live.log && return 0 )
 	fi
 }
 
@@ -349,17 +341,18 @@ find_cow_device ()
 				done
 			fi
 
-			# udev >=146-1 no longer provides vol_id:
+			# udev (>= 146) no longer provides vol_id
 			if [ -x /lib/udev/vol_id ]
 			then
+				# lenny
 				if [ "$(/lib/udev/vol_id -l ${devname} 2>/dev/null)" = "${pers_label}" ]
 				then
 					echo "${devname}"
 					return 0
 				fi
 			else
-				eval $(blkid -o udev "${devname}")
-				if [ "$ID_FS_LABEL" = "${pers_label}" ]
+				# squeeze
+				if [ "$(/sbin/blkid -s LABEL -o value $devname 2>/dev/null)" = "${pers_label}" ]
 				then
 					echo "${devname}"
 					return 0
@@ -376,17 +369,15 @@ find_cow_device ()
 			case "$(get_fstype ${devname})" in
 				vfat|ext2|ext3|ext4|jffs2)
 					mkdir -p "${cow_backing}"
-					if ! try_mount "${devname}" "${cow_backing}" "rw"
+					if try_mount "${devname}" "${cow_backing}" "rw"
 					then
-						break
-					fi
-
-					if [ -f "${pers_fpath}" ]
-					then
-						echo $(setup_loop "${pers_fpath}" "loop" "/sys/block/loop*")
-						return 0
-					else
-						umount ${cow_backing}
+						if [ -f "${pers_fpath}" ]
+						then
+							echo $(setup_loop "${pers_fpath}" "loop" "/sys/block/loop*")
+							return 0
+						else
+							umount ${cow_backing} > /dev/null 2>&1 || true
+						fi
 					fi
 					;;
 				*)