Fix spurious error msgs from live-boot about failed mounts…

[live-boot-grml.git] / components / 9990-misc-helpers.sh

diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh
index 23024eb..7994ecd 100755 (executable)
--- a/components/9990-misc-helpers.sh
+++ b/components/9990-misc-helpers.sh
@@ -120,7 +120,24 @@ check_dev ()
 
                if [ "$ISO_DEVICE" = "/" ]
                then
-                       echo "Warning: device for bootoption fromiso= ($FROMISO) not found.">>/boot.log
+                       # not a block device, check if it's an iso file, for
+                       # example an ISO when booting on an ONIE system
+                       if echo "${FROMISO}" | grep -q "\.iso$"
+                       then
+                               fs_type=$(get_fstype "${FROMISO}")
+                               if is_supported_fs ${fs_type}
+                               then
+                                       mkdir /run/live/fromiso
+                                       mount -t $fs_type "${FROMISO}" /run/live/fromiso
+                                       if [ "$?" != 0 ]
+                                       then
+                                               echo "Warning: unable to mount ${FROMISO}." >>/boot.log
+                                       fi
+                                       devname="/run/live/fromiso"
+                               fi
+                       else
+                               echo "Warning: device for bootoption fromiso= ($FROMISO) not found.">>/boot.log
+                       fi
                else
                        fs_type=$(get_fstype "${ISO_DEVICE}")
                        if is_supported_fs ${fs_type}
@@ -455,6 +472,14 @@ is_supported_fs ()
        fi
 
        # Try to look if it is already supported by the kernel
+       # For ntfs, since user space program ntfs-3g will be used. Check ntfs-3g instead of kernel module.
+       if [ "${fstype}" = "ntfs" ]; then
+               if type ntfs-3g >/dev/null 2>&1; then
+                       return 0
+               else
+                       return 1
+               fi
+       fi
        if grep -q ${fstype} /proc/filesystems
        then
                return 0
@@ -755,7 +780,7 @@ mount_persistence_media ()
                then
                        mount_opts="ro,noatime"
                fi
-               if mount -t "${fstype}" -o "${mount_opts}" "${device}" "${backing}" >/dev/null
+               if mount -t "${fstype}" -o "${mount_opts}" "${device}" "${backing}" >/dev/null 2>&1
                then
                        echo ${backing}
                        return 0
@@ -1358,8 +1383,8 @@ do_union ()
                        # + a workdir to become mounted
                        # + workdir and upperdir to reside under the same mount
                        # + workdir and upperdir to be in separate directories
-                       mkdir "${unionrw}/rw"
-                       mkdir "${unionrw}/work"
+                       mkdir -p "${unionrw}/rw"
+                       mkdir -p "${unionrw}/work"
                        unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}/rw,workdir=${unionrw}/work"
                        ;;
        esac