Do not specify 'noxino' between directories.

[live-boot-grml.git] / scripts / live

diff --git a/scripts/live b/scripts/live
index 3e7ed03..d05080d 100755 (executable)
--- 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