Adding upstream version 3.0~b10.

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

diff --git a/scripts/boot/9990-main.sh b/scripts/boot/9990-main.sh
index 2cf1d7e..c696781 100755 (executable)
--- a/scripts/boot/9990-main.sh
+++ b/scripts/boot/9990-main.sh
@@ -27,6 +27,17 @@ Main ()
 
        Select_eth_device
 
+       if [ -e /conf/param.conf ]
+       then
+               . /conf/param.conf
+       fi
+
+       if [ -n "${FUSE_MOUNT}" ]
+       then
+               # fuse does not work with klibc mount
+               ln -f /bin/mount.util-linux /bin/mount
+       fi
+
        # Needed here too because some things (*cough* udev *cough*)
        # changes the timeout
 
@@ -127,7 +138,7 @@ Main ()
 
        if [ -n "${ROOT_PID}" ]
        then
-               echo "${ROOT_PID}" > "${rootmnt}"/live/root.pid
+               echo "${ROOT_PID}" > "${rootmnt}"/lib/live/root.pid
        fi
 
        log_end_msg
@@ -141,11 +152,8 @@ Main ()
        esac
 
        # Move to the new root filesystem so that programs there can get at it.
-       if [ ! -d /root/live/image ]
-       then
-               mkdir -p /root/live/image
-               mount --move /live/image /root/live/image
-       fi
+       mkdir -p /root/lib/live/mount/medium
+       mount --move /live/medium /root/lib/live/mount/medium
 
        # aufs2 in kernel versions around 2.6.33 has a regression:
        # directories can't be accessed when read for the first the time,
@@ -154,10 +162,10 @@ Main ()
        ls /root/* >/dev/null 2>&1
 
        # Move findiso directory to the new root filesystem so that programs there can get at it.
-       if [ -d /live/findiso ] && [ ! -d /root/live/findiso ]
+       if [ -d /live/findiso ]
        then
-               mkdir -p /root/live/findiso
-               mount -n --move /live/findiso /root/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
@@ -167,10 +175,10 @@ Main ()
        then
                losetup -d /dev/loop0
 
-               if is_mountpoint /root/live/findiso
+               if is_mountpoint /root/lib/live/mount/findiso
                then
-                       umount /root/live/findiso
-                       rmdir --ignore-fail-on-non-empty /root/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