summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMarco Amadori <marco.amadori@gmail.com>2008-08-05 21:50:04 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:48:00 +0100
commit9d591ba166697b8cac2c981329217f1d32baa764 (patch)
tree5c4304a4c3afda2d5b8224b84e4c2a1306a728ff /scripts
parentf62cc0eefdb0075075cbc46155ab91485a21a6fb (diff)
downloadlive-boot-9d591ba166697b8cac2c981329217f1d32baa764.tar.gz
live-boot-9d591ba166697b8cac2c981329217f1d32baa764.zip
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.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/live-helpers27
1 files changed, 22 insertions, 5 deletions
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
}