Updating file paths for /lib/live/mount.

See http://lists.debian.org/debian-live/2012/10/msg00021.html
for more information.

diff --git a/backends/initramfs-tools/live.hook b/backends/initramfs-tools/live.hook
index 738257b..3860f4c 100755 (executable)
--- a/backends/initramfs-tools/live.hook
+++ b/backends/initramfs-tools/live.hook
@@ -8,7 +8,7 @@ set -e
 
 # Reading configuration file from filesystem and live-media
 for _FILE in /etc/live/boot.conf /etc/live/boot/* \
-            /lib/live/image/live/boot.conf /lib/live/image/live/boot/*
+            /lib/live/mount/media/live/boot.conf /lib/live/mount/media/live/boot/*
 do
        if [ -e "${_FILE}" ]
        then

diff --git a/scripts/boot/9990-main.sh b/scripts/boot/9990-main.sh
index ef41fb0..171d0ea 100755 (executable)
--- a/scripts/boot/9990-main.sh
+++ b/scripts/boot/9990-main.sh
@@ -146,8 +146,8 @@ Main ()
        esac
 
        # Move to the new root filesystem so that programs there can get at it.
-       mkdir -p /root/lib/live/image
-       mount --move /live/image /root/lib/live/image
+       mkdir -p /root/lib/live/mount/image
+       mount --move /live/image /root/lib/live/mount/image
 
        # aufs2 in kernel versions around 2.6.33 has a regression:
        # directories can't be accessed when read for the first the time,
@@ -158,8 +158,8 @@ Main ()
        # Move findiso directory to the new root filesystem so that programs there can get at it.
        if [ -d /live/findiso ]
        then
-               mkdir -p /root/lib/live/findiso
-               mount -n --move /live/findiso /root/lib/live/findiso
+               mkdir -p /root/lib/live/mount/findiso
+               mount -n --move /live/findiso /root/lib/live/mount/findiso
        fi
 
        # if we do not unmount the ISO we can't run "fsck /dev/ice" later on
@@ -169,10 +169,10 @@ Main ()
        then
                losetup -d /dev/loop0
 
-               if is_mountpoint /root/lib/live/findiso
+               if is_mountpoint /root/lib/live/mount/findiso
                then
-                       umount /root/lib/live/findiso
-                       rmdir --ignore-fail-on-non-empty /root/lib/live/findiso \
+                       umount /root/lib/live/mount/findiso
+                       rmdir --ignore-fail-on-non-empty /root/lib/live/mount/findiso \
                                >/dev/null 2>&1 || true
                fi
        fi

diff --git a/scripts/boot/9990-overlay.sh b/scripts/boot/9990-overlay.sh
index 13c1a0c..acb2e91 100755 (executable)
--- a/scripts/boot/9990-overlay.sh
+++ b/scripts/boot/9990-overlay.sh
@@ -404,22 +404,22 @@ setup_unionfs ()
        do
                if [ -d "/live/${_DIRECTORY}" ]
                then
-                       mkdir -p "${rootmnt}/lib/live/${_DIRECTORY}"
+                       mkdir -p "${rootmnt}/lib/live/mount/${_DIRECTORY}"
 
                        for _MOUNT in $(ls /live/${_DIRECTORY})
                        do
-                               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}"
+                               mkdir -p "${rootmnt}/lib/live/mount/${_DIRECTORY}/${_MOUNT}"
+                               mount -o move "/live/${_DIRECTORY}/${_MOUNT}" "${rootmnt}/lib/live/mount/${_DIRECTORY}/${_MOUNT}" > /dev/null 2>&1 || \
+                                       mount -o bind "/live/${_DIRECTORY}/${_MOUNT}" "${rootmnt}/lib/live/mount/${_DIRECTORY}/${_MOUNT}" || \
+                                       log_warning_msg "W: failed to mount /live/${_DIRECTORY}/${_MOUNT} to ${rootmnt}/lib/live/mount/${_DIRECTORY}/${_MOUNT}"
                        done
                fi
        done
 
-       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"
+       mkdir -p "${rootmnt}/lib/live/mount/overlay"
+       mount -o move /live/overlay "${rootmnt}/lib/live/mount/overlay" > /dev/null 2>&1 || \
+               mount -o bind /live/overlay "${rootmnt}/lib/live/mount/overlay" || \
+               log_warning_msg "W: failed to mount /live/overlay to ${rootmnt}/lib/live/mount/overlay"
 
         # ensure that a potentially stray tmpfs gets removed
         # otherways, initramfs-tools is unable to remove /live