X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fboot%2F9990-overlay.sh;h=8283c73a97bd44b7172c2f985a750c70dd9df484;hb=b29ebc6778d9b8bef906ebb1feac43c0a202f1fb;hp=d377d3433196e4fd704d03e2fa16a01f69aa5885;hpb=601f25e49f45f4849957c70f3cf0ab77c4be9579;p=live-boot-grml.git diff --git a/scripts/boot/9990-overlay.sh b/scripts/boot/9990-overlay.sh index d377d34..8283c73 100755 --- a/scripts/boot/9990-overlay.sh +++ b/scripts/boot/9990-overlay.sh @@ -405,30 +405,30 @@ setup_unionfs () done fi - # make /root/live writable for moving filesystems - mkdir -p "${rootmnt}/live" - mount -t tmpfs tmpfs "${rootmnt}/live" + # make /root/lib/live writable for moving filesystems + mkdir -p "${rootmnt}/lib/live" + mount -t tmpfs tmpfs "${rootmnt}/lib/live" # move all mountpoints to root filesystem for _DIRECTORY in rofs persistence do if [ -d "/live/${_DIRECTORY}" ] then - mkdir -p "${rootmnt}/live/${_DIRECTORY}" + mkdir -p "${rootmnt}/lib/live/${_DIRECTORY}" for _MOUNT in $(ls /live/${_DIRECTORY}) do - mkdir -p "${rootmnt}/live/${_DIRECTORY}/${_MOUNT}" - mount -o move "/live/${_DIRECTORY}/${_MOUNT}" "${rootmnt}/live/${_DIRECTORY}/${_MOUNT}" > /dev/null 2>&1 || \ - mount -o bind "/live/${_DIRECTORY}/${_MOUNT}" "${rootmnt}/live/${_DIRECTORY}/${_MOUNT}" || \ - log_warning_msg "W: failed to mount /live/${_DIRECTORY}/${_MOUNT} to ${rootmnt}/live/${_DIRECTORY}/${_MOUNT}" + mkdir -p "${rootmnt}/lib/live/${_DIRECTORY}/${_MOUNT}" + mount -o move "/live/${_DIRECTORY}/${_MOUNT}" "${rootmnt}/lib/live/${_DIRECTORY}/${_MOUNT}" > /dev/null 2>&1 || \ + mount -o bind "/live/${_DIRECTORY}/${_MOUNT}" "${rootmnt}/lib/live/${_DIRECTORY}/${_MOUNT}" || \ + log_warning_msg "W: failed to mount /live/${_DIRECTORY}/${_MOUNT} to ${rootmnt}/lib/live/${_DIRECTORY}/${_MOUNT}" done fi done - mkdir -p "${rootmnt}/live/overlay" - mount -o move /live/overlay "${rootmnt}/live/overlay" > /dev/null 2>&1 || \ - mount -o bind /overlay "${rootmnt}/live/overlay" || \ - log_warning_msg "W: failed to mount /overlay to ${rootmnt}/live/overlay" + mkdir -p "${rootmnt}/lib/live/overlay" + mount -o move /live/overlay "${rootmnt}/lib/live/overlay" > /dev/null 2>&1 || \ + mount -o bind /live/overlay "${rootmnt}/lib/live/overlay" || \ + log_warning_msg "W: failed to mount /live/overlay to ${rootmnt}/lib/live/overlay" }