X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=314c33f59dd4599c8f60c5cece0f529815e58fd2;hb=7750592e832e06cf41c3f7a9b13ac343fea50898;hp=0d97d108c7b38e8a70f143499d7ac135ce6edcf9;hpb=e4b9ce3049d5eceb4cb815087062a5bed0d6c2ce;p=live-boot-grml.git

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 0d97d10..314c33f 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -1,4 +1,4 @@
-# live-initramfs helper functions, used by live-initramfs on boot and by live-snapshot
+# live-boot helper functions, used by live-boot on boot and by live-snapshot
 
 if [ ! -x "/bin/fstype" ]
 then
@@ -76,7 +76,15 @@ is_supported_fs ()
 
 get_fstype ()
 {
-	/lib/udev/vol_id -t ${1} 2>/dev/null
+	# 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
+		# squeeze
+		/sbin/blkid -s TYPE -o value $1 2>/dev/null
+	fi
 }
 
 where_is_mounted ()
@@ -179,16 +187,13 @@ setup_loop ()
 	local encryption=${5}
 	local readonly=${6}
 
-	modprobe -q -b "${module}"
+	# the output of setup_loop is evaluated in other functions,
+	# modprobe leaks kernel options like "libata.dma=0"
+	# as "options libata dma=0" on stdout, causing serious
+	# problems therefor, so instead always avoid output to stdout
+	modprobe -q -b "${module}" 1>/dev/null
 
-	if [ -x /sbin/udevadm ]
-	then
-		# lenny
-		udevadm settle
-	else
-		# etch
-		udevsettle
-	fi
+	udevadm settle
 
 	for loopdev in ${pattern}
 	do
@@ -277,7 +282,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
 }
 
@@ -339,10 +345,22 @@ find_cow_device ()
 				done
 			fi
 
-			if [ "$(/lib/udev/vol_id -l ${devname} 2>/dev/null)" = "${pers_label}" ]
+			# udev (>= 146) no longer provides vol_id
+			if [ -x /lib/udev/vol_id ]
 			then
-				echo "${devname}"
-				return 0
+				# lenny
+				if [ "$(/lib/udev/vol_id -l ${devname} 2>/dev/null)" = "${pers_label}" ]
+				then
+					echo "${devname}"
+					return 0
+				fi
+			else
+				# squeeze
+				if [ "$(/sbin/blkid -s LABEL -o value $devname 2>/dev/null)" = "${pers_label}" ]
+				then
+					echo "${devname}"
+					return 0
+				fi
 			fi
 
 			if [ "${PERSISTENT}" = "nofiles" ]
@@ -355,17 +373,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
 					;;
 				*)