X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=26414877b782f64046a03f245218acc6c4e17131;hb=1736a26b70a1af93c290cfa9f4e7b593b7554d22;hp=70c7f342a77243011b1370feb9b88d16e35e25f9;hpb=3fa29d4e1c65f412e5c9bf12ef18d01783f30cae;p=live-boot-grml.git

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 70c7f34..2641487 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -77,7 +77,7 @@ get_fstype ()
 	    return
 	fi
 
-	eval $(fstype < ${1})
+	eval $(fstype < ${1} 2>/dev/null)
 
 	if [ "${FSTYPE}" != "unknown" ]
 	then
@@ -146,7 +146,7 @@ fs_size ()
 			mountp="/mnt/tmp_fs_size"
 
 			mkdir -p "${mountp}"
-			mount -n -t $(get_fstype "${dev}") -o ro "${dev}" "${mountp}"
+			mount -t $(get_fstype "${dev}") -o ro "${dev}" "${mountp}" || log_warning_msg "cannot mount -t $(get_fstype ${dev}) -o ro ${dev} ${mountp}"
 
 			doumount=1
 		fi
@@ -163,7 +163,7 @@ fs_size ()
 
 	if [ -n "${doumount}" ]
 	then
-		umount "${mountp}"
+		umount "${mountp}" || log_warning_msg "cannot umount ${mountp}"
 		rmdir "${mountp}"
 	fi
 
@@ -269,15 +269,20 @@ try_mount ()
 	dev="${1}"
 	mountp="${2}"
 	opts="${3}"
+	fstype="${4}"
 
 	old_mountp="$(where_is_mounted ${dev})"
 
 	if [ -n "${old_mountp}" ]
 	then
-		mount -n -o remount,"${opts}" "${dev}" "${old_mountp}" || panic "Remounting ${dev} ${opts} on ${old_mountp} failed"
-		mount -n -o bind "${old_mountp}" "${mountp}" || panic "Cannot bind-mount ${old_mountp} on ${mountp}"
+		mount -o remount,"${opts}" "${dev}" "${old_mountp}" || panic "Remounting ${dev} ${opts} on ${old_mountp} failed"
+		mount -o bind "${old_mountp}" "${mountp}" || panic "Cannot bind-mount ${old_mountp} on ${mountp}"
 	else
-		mount -n -t $(get_fstype "${dev}") -o "${opts}" "${dev}" "${mountp}" || panic "Cannot mount ${dev} on ${mountp}"
+		if [ -z "${fstype}" ]
+		then
+			fstype=$(get_fstype "${dev}")
+		fi
+		mount -t "${fstype}" -o "${opts}" "${dev}" "${mountp}" || panic "Cannot mount ${dev} on ${mountp}, fstype=${fstype}, options=${opts}"
 	fi
 }
 
@@ -336,16 +341,19 @@ find_files ()
 			if is_supported_fs ${devfstype}
 			then
 				mkdir -p "${snap_backing}"
-				try_mount "${devname}" "${snap_backing}" "ro"
 
-				for filename in ${filenames}
+				if try_mount "${devname}" "${snap_backing}" "ro" "${devfstype}"
+				then
+					for filename in ${filenames}
 					do
-					if [ -f "${snap_backing}/${filename}" ]
-					then
-						echo "${devname} ${snap_backing} ${filename}"
-						return 0
-					fi
-				done
+						if [ -f "${snap_backing}/${filename}" ]
+						then
+							echo "${devname} ${snap_backing} ${filename}"
+							# return without mounting, it will be umounted later
+							return 0
+						fi
+					done
+				fi
 
 				umount ${snap_backing}
 			fi