[SCM] debian-live branch, master, updated. debian/1.136.3-1-5-gb78a6eb

[Marco Amadori]

The following commit has been merged in the master branch:
commit b78a6ebcecb273908655f79d188bfc60452c4233
Author: Marco Amadori <marco.amadori at gmail.com>
Date:   Tue Aug 5 21:50:04 2008 +0200

    The list of supported filesytems goes dynamic.
    
    - The plain list of "should be a supported filesystem" finally is fixed,
      now it scans /proc to see if the kernel is able to mount it, if not it
      modprobes it and as a failover tries to insmod it from the real rootfs
      /lib/modules directory if it can.
    - This should fix - en passant - the "drop to busybox shell if a ntfs
      filesystem is found while scanning for persistence media" bug as well.
    
    Signed-off-by: Marco Amadori <marco.amadori at gmail.com>

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

-- 
debian-live