From: Daniel Baumann <daniel@debian.org>
Date: Wed, 26 Sep 2012 11:36:45 +0000 (+0200)
Subject: Always move live filesystem mounts to /root within initramfs, regardless if mountpoin... 
X-Git-Tag: debian/3.0_b3-1~4
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;ds=sidebyside;h=b7f0254874e284b1370f00056a72541fccccd07e;p=live-boot-grml.git

Always move live filesystem mounts to /root within initramfs, regardless if mountpoint already exists or not (Closes: #688782).
---

diff --git a/scripts/boot/9990-main.sh b/scripts/boot/9990-main.sh
index 5732b2a..ba77dd4 100755
--- a/scripts/boot/9990-main.sh
+++ b/scripts/boot/9990-main.sh
@@ -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/live/image
+	mount --move /live/image /root/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,7 +156,7 @@ 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