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

diff --git a/scripts/live-helpers b/scripts/live-helpers
index f99fa56..fdf7b38 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -31,14 +31,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 +190,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