Remove a number of "${quiet}" checks - they are repeated in the log_*_msg functions.

[live-boot-grml.git] / scripts / live-helpers

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 20952f3..fdf7b38 100644 (file)
--- 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
 }
@@ -72,12 +95,9 @@ where_is_mounted ()
 
        if grep -q "^${device} " /proc/mounts
        then
-               grep "^${device} " /proc/mounts | read d mountpoint rest
-               echo ${mountpoint}
-               return 0
+               # return the first found
+               grep "^${device} " /proc/mounts | cut -f2 -d ' '
        fi
-
-       return 1
 }
 
 lastline ()
@@ -120,9 +140,9 @@ fs_size ()
 
        if [ -z "${mountp}" ]
        then
-               mountp=$(where_is_mounted "${dev}")
+               mountp="$(where_is_mounted ${dev})"
 
-               if [ "${?}" -gt 0 ]
+               if [ -z "${mountp}" ]
                then
                        mountp="/mnt/tmp_fs_size"
 
@@ -170,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
@@ -181,7 +209,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
@@ -243,10 +271,12 @@ try_mount ()
        mountp="${2}"
        opts="${3}"
 
-       if where_is_mounted ${dev} > /dev/null
+       old_mountp="$(where_is_mounted ${dev})"
+
+       if [ -n "${old_mountp}" ]
        then
-               mount -o remount,"${opts}" ${dev} $(where_is_mounted ${dev}) || panic "Remounting failed"
-               mount -o bind $(where_is_mounted ${dev}) ${mountp} || panic "Cannot bind-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}"
        fi