X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fboot%2F9990-main.sh;h=ef41fb048e6a6da6399e9806ec6a332fa089f4e5;hb=96b643e3a4d8ee0dcf0526182190a9d4526c626b;hp=5732b2aefcc42d210a261991a139434eda5f3335;hpb=990d419eacf614710c838ef743aa10ec0612ed7a;p=live-boot-grml.git

diff --git a/scripts/boot/9990-main.sh b/scripts/boot/9990-main.sh
index 5732b2a..ef41fb0 100755
--- a/scripts/boot/9990-main.sh
+++ b/scripts/boot/9990-main.sh
@@ -132,7 +132,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
@@ -146,11 +146,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/image
+	mount --move /live/image /root/lib/live/image
 
 	# aufs2 in kernel versions around 2.6.33 has a regression:
 	# directories can't be accessed when read for the first the time,
@@ -159,10 +156,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/findiso
+		mount -n --move /live/findiso /root/lib/live/findiso
 	fi
 
 	# if we do not unmount the ISO we can't run "fsck /dev/ice" later on
@@ -172,10 +169,10 @@ Main ()
 	then
 		losetup -d /dev/loop0
 
-		if is_mountpoint /root/live/findiso
+		if is_mountpoint /root/lib/live/findiso
 		then
-			umount /root/live/findiso
-			rmdir --ignore-fail-on-non-empty /root/live/findiso \
+			umount /root/lib/live/findiso
+			rmdir --ignore-fail-on-non-empty /root/lib/live/findiso \
 				>/dev/null 2>&1 || true
 		fi
 	fi