diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-09-26 13:36:45 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-09-26 13:36:45 +0200 |
| commit | b7f0254874e284b1370f00056a72541fccccd07e (patch) | |
| tree | 92b0fcfdedac0341c76e096888f37992959ee400 /scripts/boot/9990-main.sh | |
| parent | 09fe71c946fa4f8c836bc8e817c6309fbc443bee (diff) | |
| download | live-boot-b7f0254874e284b1370f00056a72541fccccd07e.tar.gz live-boot-b7f0254874e284b1370f00056a72541fccccd07e.zip | |
Always move live filesystem mounts to /root within initramfs, regardless if mountpoint already exists or not (Closes: #688782).
Diffstat (limited to 'scripts/boot/9990-main.sh')
| -rwxr-xr-x | scripts/boot/9990-main.sh | 9 |
1 files 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 |