X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=d05080d7822856801a501434fde95413b0330d8b;hb=787bd5658e8a19109e256417a0a5424321c2b289;hp=3e7ed03115bfd40e3f7733be9ba0fd7d75e29631;hpb=612de86fa7f8d721690c1b70e216cbc678d280a7;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 3e7ed03..d05080d 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1093,11 +1093,19 @@ setup_unionfs ()
 
 			if ! cut -f2 /proc/filesystems | grep -q "^${UNIONTYPE}\$" && [ -x /bin/unionfs-fuse ]
 			then
+				echo "${UNIONTYPE} not available, falling back to unionfs-fuse."
+				echo "This might be really slow."
+
 				UNIONTYPE="unionfs-fuse"
 			fi
 			;;
 	esac
 
+	if [ "${UNIONTYPE}" = unionfs-fuse ]
+	then
+		modprobe fuse
+	fi
+
 	# run-init can't deal with images in a subdir, but we're going to
 	# move all of these away before it runs anyway.  No, we're not,
 	# put them in / since move-mounting them into / breaks mono and
@@ -1111,7 +1119,8 @@ setup_unionfs ()
 
 	if [ "${UNIONTYPE}" = "aufs" ]
 	then
-		roopt="rr,noxino"
+		roopt="rr"
+		noxino_opt="noxino,"
 	elif [ "${UNIONTYPE}" = "unionfs-fuse" ]
 	then
 		roopt="RO"
@@ -1372,7 +1381,7 @@ setup_unionfs ()
 				;;
 
 			*)
-				mount -t ${UNIONTYPE} -o noatime,dirs=/cow=rw:${rofsstring} ${UNIONTYPE} "${rootmnt}" || panic "mount ${UNIONTYPE} on ${rootmnt} failed with option noatime,dirs=/cow=rw:${rofsstring}"
+				mount -t ${UNIONTYPE} -o noatime,${noxino_opt}dirs=/cow=rw:${rofsstring} ${UNIONTYPE} "${rootmnt}" || panic "mount ${UNIONTYPE} on ${rootmnt} failed with option noatime,${noxino_opt}dirs=/cow=rw:${rofsstring}"
 				;;
 		esac
 	fi