X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=d05080d7822856801a501434fde95413b0330d8b;hb=787bd5658e8a19109e256417a0a5424321c2b289;hp=4833d996a0aef4bce9bc4068d0d32c814b81785b;hpb=9df7712eed3d1fc0ec45e18140e69868cd065120;p=live-boot-grml.git diff --git a/scripts/live b/scripts/live index 4833d99..d05080d 100755 --- a/scripts/live +++ b/scripts/live @@ -1101,6 +1101,11 @@ setup_unionfs () ;; 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 @@ -1114,7 +1119,8 @@ setup_unionfs () if [ "${UNIONTYPE}" = "aufs" ] then - roopt="rr,noxino" + roopt="rr" + noxino_opt="noxino," elif [ "${UNIONTYPE}" = "unionfs-fuse" ] then roopt="RO" @@ -1375,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