X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=bb5653ce607375bbdf57187d766353b78b065404;hb=c2102d9620c54541825f267d1b9575d886e8b820;hp=b8b9cf182b3627392b80f7e1881e24bfcb159e27;hpb=4345edc8be4f91ee5ee34684df397d6776bee521;p=live-boot-grml.git

diff --git a/scripts/live-helpers b/scripts/live-helpers
index b8b9cf1..bb5653c 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
 }
@@ -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
@@ -178,7 +208,7 @@ setup_loop ()
 
 			if [ -n ${readonly} ]
 			then
-				if /sbin/losetup --help 2>&1 | grep -q -- "-r\b"
+				if losetup --help 2>&1 | grep -q -- "-r\b"
 				then
 					options="${options} -r"
 				fi