X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=components%2F9990-misc-helpers.sh;h=a97615bb6ddc5f128eeafa0be2d10e8e121dc1f5;hb=6f465ddc145fb527215865ed042875d231d8dcfd;hp=0c8b74ebcc479f827e7f1ccd0c55dbe758ad8aee;hpb=d99dfbf1fc7b6a4fcdc128396c40e24d638cfcaf;p=live-boot-grml.git diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh index 0c8b74e..a97615b 100755 --- a/components/9990-misc-helpers.sh +++ b/components/9990-misc-helpers.sh @@ -420,6 +420,12 @@ is_supported_fs () return 1 fi + # get_fstype might report "unknown" or "swap", ignore it as no such kernel module exists + if [ "${fstype}" = "unknown" ] || [ "${fstype}" = "swap" ] + then + return 1 + fi + # Try to look if it is already supported by the kernel if grep -q ${fstype} /proc/filesystems then @@ -1320,7 +1326,6 @@ do_union () mkdir "${unionrw}/rw" mkdir "${unionrw}/work" unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}/rw,workdir=${unionrw}/work" - mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}" ;; esac