X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=components%2F9990-misc-helpers.sh;h=a97615bb6ddc5f128eeafa0be2d10e8e121dc1f5;hb=da50dd404b60b90161a0b8c33698c3d36496d7cd;hp=4815553894272ae5d235bd0237e2b519381d535d;hpb=c5b6cb0b238bc8230a9366abafa73752dc093d27;p=live-boot-grml.git

diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh
index 4815553..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
@@ -1301,7 +1307,6 @@ do_union ()
 					unionmountopts="${unionmountopts}:${rofs}=${ro_opt}"
 				done
 			fi
-			mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}"
 			;;
 
 		overlay)
@@ -1321,9 +1326,10 @@ 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
+
+	mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}"
 }
 
 get_custom_mounts ()