X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=0b9bd5ffecf2f78ec50d971e0f0e3d854d5f61f8;hb=67b01b3fc59e5535b28d89c46895c94c5aa06d26;hp=f99fa5674d3da0505f6f3b2be1b514014e21db57;hpb=9fce4d8ed2f15757322c68625de3398566a69f44;p=live-boot-grml.git

diff --git a/scripts/live-helpers b/scripts/live-helpers
index f99fa56..0b9bd5f 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -1,4 +1,3 @@
-#!/bin/sh
 # live-initramfs helper functions, used by live-initramfs on boot and by live-snapshot
 
 if [ ! -x "/bin/fstype" ]
@@ -31,14 +30,37 @@ subdevices ()
 
 is_supported_fs ()
 {
-	# FIXME: do something better like the scan of supported filesystems
 	fstype="${1}"
 
-	case ${fstype} in
-		vfat|iso9660|udf|ext2|ext3|ntfs|jffs2)
+	# 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
-		;;
-	esac
+	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
 }
@@ -55,7 +77,7 @@ get_fstype ()
 	    return
 	fi
 
-	eval $(fstype < ${1})
+	eval $(fstype < ${1} 2>/dev/null)
 
 	if [ "${FSTYPE}" != "unknown" ]
 	then
@@ -167,7 +189,15 @@ setup_loop ()
 	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
@@ -239,6 +269,7 @@ try_mount ()
 	dev="${1}"
 	mountp="${2}"
 	opts="${3}"
+	fstype="${4}"
 
 	old_mountp="$(where_is_mounted ${dev})"
 
@@ -247,7 +278,11 @@ try_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}"
+		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
 }
 
@@ -306,7 +341,7 @@ find_files ()
 			if is_supported_fs ${devfstype}
 			then
 				mkdir -p "${snap_backing}"
-				try_mount "${devname}" "${snap_backing}" "ro"
+				try_mount "${devname}" "${snap_backing}" "ro" ${devfstype}
 
 				for filename in ${filenames}
 					do