X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=components%2F9990-misc-helpers.sh;h=4815553894272ae5d235bd0237e2b519381d535d;hb=c5b6cb0b238bc8230a9366abafa73752dc093d27;hp=e1f2824335459d3e2e19a77153942900d9e667c9;hpb=7a9c73733e5254d36ddc5df87c5908e5cea3ea77;p=live-boot-grml.git diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh index e1f2824..4815553 100755 --- a/components/9990-misc-helpers.sh +++ b/components/9990-misc-helpers.sh @@ -1305,9 +1305,6 @@ do_union () ;; overlay) - rw_opt="rw" - ro_opt="ro" - # XXX: can multiple unionro be used? (overlay only handles two dirs, but perhaps they can be chained?) # XXX: and can unionro be optional? i.e. can overlay skip lowerdir? if echo ${unionro} | grep -q " " @@ -1317,13 +1314,12 @@ do_union () then panic "overlay needs at least one lower filesystem (read-only branch)." fi - unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}" # overlayfs requires: # + a workdir to become mounted # + workdir and upperdir to reside under the same mount # + workdir and upperdir to be in separate directories - mkdir ${unionrw}/rw - mkdir ${unionrw}/work + mkdir "${unionrw}/rw" + mkdir "${unionrw}/work" unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}/rw,workdir=${unionrw}/work" mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}" ;;