Releasing debian version 3.0~b4-1.

[live-boot-grml.git] / scripts / boot / 9990-overlay.sh

diff --git a/scripts/boot/9990-overlay.sh b/scripts/boot/9990-overlay.sh
index 9318f9b..8283c73 100755 (executable)
--- a/scripts/boot/9990-overlay.sh
+++ b/scripts/boot/9990-overlay.sh
@@ -405,29 +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
 
-       # shows cow fs on /overlay (FIXME: do we still need/want this? probably yes)
-       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 "Unable to move or bind /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"
 
 }