From 476f642f1d56377a684f532d17ef4550bb89aacb Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 3 Oct 2012 13:57:49 +0200 Subject: [PATCH] Renaming /lib/live/mount/image to /lib/live/mount/medium. See http://lists.debian.org/debian-live/2012/10/msg00023.html for more information. --- scripts/boot/9990-aaa-fixme.sh | 2 +- scripts/boot/9990-main.sh | 4 ++-- scripts/boot/9990-misc-helpers.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/boot/9990-aaa-fixme.sh b/scripts/boot/9990-aaa-fixme.sh index 822a604..b213bba 100755 --- a/scripts/boot/9990-aaa-fixme.sh +++ b/scripts/boot/9990-aaa-fixme.sh @@ -5,7 +5,7 @@ export PATH="/root/usr/bin:/root/usr/sbin:/root/bin:/root/sbin:/usr/bin:/usr/sbi echo "/root/lib" >> /etc/ld.so.conf echo "/root/usr/lib" >> /etc/ld.so.conf -mountpoint="/live/image" +mountpoint="/live/medium" alt_mountpoint="/media" LIVE_MEDIA_PATH="live" diff --git a/scripts/boot/9990-main.sh b/scripts/boot/9990-main.sh index 171d0ea..983a1cb 100755 --- a/scripts/boot/9990-main.sh +++ b/scripts/boot/9990-main.sh @@ -146,8 +146,8 @@ Main () esac # Move to the new root filesystem so that programs there can get at it. - mkdir -p /root/lib/live/mount/image - mount --move /live/image /root/lib/live/mount/image + 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, diff --git a/scripts/boot/9990-misc-helpers.sh b/scripts/boot/9990-misc-helpers.sh index 3455045..06fef87 100755 --- a/scripts/boot/9990-misc-helpers.sh +++ b/scripts/boot/9990-misc-helpers.sh @@ -940,7 +940,7 @@ find_persistence_media () local white_listed_devices="${2}" local ret="" - local black_listed_devices="$(what_is_mounted_on /live/image)" + local black_listed_devices="$(what_is_mounted_on /live/medium)" for dev in $(storage_devices "${black_listed_devices}" "${white_listed_devices}") do -- 2.1.4