9990-misc-helpers.sh: fix RAID detection for findiso.

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

diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh
index ef3688e..1267a67 100755 (executable)
--- a/components/9990-misc-helpers.sh
+++ b/components/9990-misc-helpers.sh
@@ -139,7 +139,20 @@ check_dev ()
        # support for fromiso=.../isofrom=....
        if [ -n "$FROMISO" ]
        then
-               ISO_DEVICE=$(dirname $FROMISO)
+               fs_type="${FROMISO%%:*}"
+               fs_type_auto='1'
+               ISO_DEVICE="${FROMISO}"
+               if echo "${fs_type}" | grep -q '[^[:alnum:]_-]'; then
+                       # Not a valid file system name. Treat as part of the
+                       # path, and, especially, use autodetection.
+                       fs_type=''
+               else
+                       # Looks like a file system specification, treat it
+                       # like that.
+                       fs_type_auto='0'
+                       ISO_DEVICE="${ISO_DEVICE#*:}"
+               fi
+               ISO_DEVICE=$(dirname "${ISO_DEVICE}")
                if ! [ -b $ISO_DEVICE ]
                then
                        # to support unusual device names like /dev/cciss/c0d0p1
@@ -160,14 +173,17 @@ check_dev ()
                        # example an ISO when booting on an ONIE system
                        if echo "${FROMISO}" | grep -q "\.iso$"
                        then
-                               fs_type=$(get_fstype "${FROMISO}")
+                               if [ '0' -ne "${fs_type_auto}" ]; then
+                                       # Autodetect fs type if not overridden.
+                                       fs_type=$(get_fstype "${FROMISO}")
+                               fi
                                if is_supported_fs ${fs_type}
                                then
                                        mkdir /run/live/fromiso
-                                       mount -t $fs_type "${FROMISO}" /run/live/fromiso
+                                       mount -t "${fs_type}" -o 'ro' "${FROMISO}" '/run/live/fromiso'
                                        if [ "$?" != 0 ]
                                        then
-                                               echo "Warning: unable to mount ${FROMISO}." >>/boot.log
+                                               echo "Warning: unable to mount ${FROMISO} (type ${fs_type})." >>/boot.log
                                        fi
                                        devname="/run/live/fromiso"
                                fi
@@ -175,16 +191,30 @@ check_dev ()
                                echo "Warning: device for bootoption fromiso= ($FROMISO) not found.">>/boot.log
                        fi
                else
-                       fs_type=$(get_fstype "${ISO_DEVICE}")
+                       # Need to extract actual ISO file path later on,
+                       # initialize first.
+                       iso_name="${FROMISO}"
+
+                       if [ '0' -ne "${fs_type_auto}" ]; then
+                               # Try to auto-detect file system if not
+                               # explicitly provided.
+                               fs_type=$(get_fstype "${ISO_DEVICE}")
+                       else
+                               # Delete file system type override.
+                               iso_name="${iso_name#*:}"
+                       fi
+                       # At this point, the backing device should always be
+                       # at the very front, so remove that - leaving only the
+                       # ISO file path.
+                       iso_name="$(echo "${iso_name}" | sed "s|^${ISO_DEVICE}||")"
                        if is_supported_fs ${fs_type}
                        then
                                mkdir /run/live/fromiso
-                               mount -t $fs_type "$ISO_DEVICE" /run/live/fromiso
-                               ISO_NAME="$(echo $FROMISO | sed "s|$ISO_DEVICE||")"
-                               loopdevname=$(setup_loop "/run/live/fromiso/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
+                               mount -t "${fs_type}" -o 'ro' "$ISO_DEVICE" '/run/live/fromiso'
+                               loopdevname=$(setup_loop "/run/live/fromiso/${iso_name}" "loop" "/sys/block/loop*" "" '')
                                devname="${loopdevname}"
                        else
-                               echo "Warning: unable to mount $ISO_DEVICE." >>/boot.log
+                               echo "Warning: unable to mount $ISO_DEVICE (type ${fs_type})." >>/boot.log
                        fi
                fi
        fi
@@ -221,12 +251,13 @@ check_dev ()
 
                        /dev/md*)
                                # Adding raid support
-                               if [ -x /scripts/local-top/mdadm ]
+                               if [ -x /scripts/local-block/mdadm ]
                                then
-                                       [ -r /conf/conf.d/md ] && cp /conf/conf.d/md /conf/conf.d/md.orig
-                                       echo "MD_DEVS=$device " >> /conf/conf.d/md
-                                       /scripts/local-top/mdadm >>/boot.log
-                                       [ -r /conf/conf.d/md.orig ] && mv /conf/conf.d/md.orig /conf/conf.d/md
+                                       # Back in the day, when there was still a local-top mdadm script, we
+                                       # used to select specific devices to be auto-assembled.
+                                       # This functionality was dropped in the local-block script, so just
+                                       # scan and assemble all RAID devices.
+                                       /scripts/local-block/mdadm >>/boot.log
                                fi
                                ;;
                esac
@@ -495,6 +526,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
@@ -753,7 +792,7 @@ try_mount ()
                        fstype=$(get_fstype "${dev}")
                fi
                mount -t "${fstype}" -o "${opts}" "${dev}" "${mountp}" || \
-               ( echo "SKIPPING: Cannot mount ${dev} on ${mountp}, fstype=${fstype}, options=${opts}" > boot.log && return 0 )
+               ( echo "SKIPPING: Cannot mount ${dev} on ${mountp}, fstype=${fstype}, options=${opts}" >> boot.log && return 0 )
        fi
 }
 
@@ -795,7 +834,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
@@ -1398,8 +1437,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