X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=fdf7b38efa5fa88d490ba618cb3869f984295b1d;hb=4e024dff26b33878ca7ef61fc108fc2de7d5c4cb;hp=3c89c95d5b4b21709dfa7da03fe38e3cca32ad69;hpb=e8d9899923fec4a87850a126869bf694ecb2b7af;p=live-boot-grml.git

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 3c89c95..fdf7b38 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -29,6 +29,43 @@ subdevices ()
 	echo ${r}
 }
 
+is_supported_fs ()
+{
+	fstype="${1}"
+
+	# Validate input first
+	if [ -z "${fstype}" ]
+	then
+		return 1
+	fi
+
+	# Try to look if it is already supported by the kernel
+	if grep -q ${fstype} /proc/filesystems
+	then
+		return 0
+	else
+		# Then try to add support for it the gentle way using the initramfs capabilities
+		modprobe ${fstype}
+		if grep -q ${fstype} /proc/filesystems
+		then
+			return 0
+		# Then try the hard way if /root is already reachable
+		else
+			kmodule="/root/lib/modules/`uname -r`/${fstype}/${fstype}.ko"
+			if [ -e "${kmodule}" ]
+			then
+				insmod "${kmodule}"
+				if grep -q ${fstype} /proc/filesystems
+				then
+					return 0
+				fi
+			fi
+		fi
+	fi
+
+	return 1
+}
+
 get_fstype ()
 {
 	local FSTYPE
@@ -58,12 +95,9 @@ where_is_mounted ()
 
 	if grep -q "^${device} " /proc/mounts
 	then
-		grep "^${device} " /proc/mounts | read d mountpoint rest
-		echo ${mountpoint}
-		return 0
+		# return the first found
+		grep "^${device} " /proc/mounts | cut -f2 -d ' '
 	fi
-
-	return 1
 }
 
 lastline ()
@@ -106,9 +140,9 @@ fs_size ()
 
 	if [ -z "${mountp}" ]
 	then
-		mountp=$(where_is_mounted "${dev}")
+		mountp="$(where_is_mounted ${dev})"
 
-		if [ "${?}" -gt 0 ]
+		if [ -z "${mountp}" ]
 		then
 			mountp="/mnt/tmp_fs_size"
 
@@ -153,9 +187,18 @@ setup_loop ()
 	local pattern=${3}
 	local offset=${4}
 	local encryption=${5}
+	local readonly=${6}
 
 	modprobe -q -b "${module}"
-	udevsettle
+
+	if [ -x /sbin/udevadm ]
+	then
+		# lenny
+		udevadm settle
+	else
+		# etch
+		udevsettle
+	fi
 
 	for loopdev in ${pattern}
 	do
@@ -164,6 +207,14 @@ setup_loop ()
 			dev=$(sys2dev "${loopdev}")
 			options=''
 
+			if [ -n ${readonly} ]
+			then
+				if losetup --help 2>&1 | grep -q -- "-r\b"
+				then
+					options="${options} -r"
+				fi
+			fi
+
 			if [ 0 -lt "${offset}" ]
 			then
 				options="${options} -o ${offset}"
@@ -220,10 +271,12 @@ try_mount ()
 	mountp="${2}"
 	opts="${3}"
 
-	if where_is_mounted ${dev} > /dev/null
+	old_mountp="$(where_is_mounted ${dev})"
+
+	if [ -n "${old_mountp}" ]
 	then
-		mount -o remount,"${opts}" ${dev} $(where_is_mounted ${dev}) || panic "Remounting failed"
-		mount -o bind $(where_is_mounted ${dev}) ${mountp} || panic "Cannot bind-mount"
+		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 -t $(get_fstype "${dev}") -o "${opts}" "${dev}" "${mountp}" || panic "Cannot mount ${dev} on ${mountp}"
 	fi
@@ -281,24 +334,22 @@ find_files ()
 			devname=$(sys2dev "${dev}")
 			devfstype="$(get_fstype ${devname})"
 
-			case "${devfstype}" in
-				vfat|ext2|ext3|jffs2)
-					# FIXME: all supported block devices should be scanned
-					mkdir -p "${snap_backing}"
-					try_mount "${devname}" "${snap_backing}" "ro"
+			if is_supported_fs ${devfstype}
+			then
+				mkdir -p "${snap_backing}"
+				try_mount "${devname}" "${snap_backing}" "ro"
 
-					for filename in ${filenames}
+				for filename in ${filenames}
 					do
-						if [ -f "${snap_backing}/${filename}" ]
-						then
-							echo "${devname} ${snap_backing} ${filename}"
-							return 0
-						fi
-					done
-
-					umount ${snap_backing}
-					;;
-			esac
+					if [ -f "${snap_backing}/${filename}" ]
+					then
+						echo "${devname} ${snap_backing} ${filename}"
+						return 0
+					fi
+				done
+
+				umount ${snap_backing}
+			fi
 		done
 	done
 }