From b7f0254874e284b1370f00056a72541fccccd07e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 26 Sep 2012 13:36:45 +0200 Subject: [PATCH] Always move live filesystem mounts to /root within initramfs, regardless if mountpoint already exists or not (Closes: #688782). --- scripts/boot/9990-main.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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 -- 2.1.4