X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=components%2F9990-misc-helpers.sh;h=7994ecd0d0a98d83037c64d047aaa5c9f7c775d0;hb=de2eaf61a458dcd490f01494f8e2ed6e23c416ca;hp=23024eb61d934ff266df6bec04e37c7e4b75e859;hpb=00b1535be06d4c045033a7f7b8a8226d44e40ded;p=live-boot-grml.git diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh index 23024eb..7994ecd 100755 --- 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