summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Boccassi <bluca@debian.org>2018-03-13 21:37:55 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2018-09-15 11:05:30 +0000
commitbfb89c6e931e0cd896fbfef0862933f39047a801 (patch)
treeec7cc68efadd5daf370879b4976c3d8f21d70a46
parentFixing custom mounts after switch to /run/live. (diff)
downloadsystem-boot-bfb89c6e931e0cd896fbfef0862933f39047a801.tar.xz
system-boot-bfb89c6e931e0cd896fbfef0862933f39047a801.zip
Fixing fromiso after switch to /run/live.
/live/fromiso was still used, switch to /run/live/fromiso to follow changes from 0d878d3a6798 (see #886328). Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
-rwxr-xr-xcomponents/9990-main.sh6
-rwxr-xr-xcomponents/9990-misc-helpers.sh8
2 files changed, 7 insertions, 7 deletions
diff --git a/components/9990-main.sh b/components/9990-main.sh
index 4a965d5..b585704 100755
--- a/components/9990-main.sh
+++ b/components/9990-main.sh
@@ -111,10 +111,10 @@ Live ()
then
losetup -d /dev/loop0
- if is_mountpoint /live/fromiso
+ if is_mountpoint /run/live/fromiso
then
- umount /live/fromiso
- rmdir --ignore-fail-on-non-empty /live/fromiso \
+ umount /run/live/fromiso
+ rmdir --ignore-fail-on-non-empty /run/live/fromiso \
>/dev/null 2>&1 || true
fi
fi
diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh
index 78985f1..215633f 100755
--- a/components/9990-misc-helpers.sh
+++ b/components/9990-misc-helpers.sh
@@ -127,10 +127,10 @@ check_dev ()
fs_type=$(get_fstype "${ISO_DEVICE}")
if is_supported_fs ${fs_type}
then
- mkdir /live/fromiso
- mount -t $fs_type "$ISO_DEVICE" /live/fromiso
+ mkdir /run/live/fromiso
+ mount -t $fs_type "$ISO_DEVICE" /run/live/fromiso
ISO_NAME="$(echo $FROMISO | sed "s|$ISO_DEVICE||")"
- loopdevname=$(setup_loop "/live/fromiso/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
+ loopdevname=$(setup_loop "/run/live/fromiso/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
devname="${loopdevname}"
else
echo "Warning: unable to mount $ISO_DEVICE." >>/boot.log
@@ -1060,7 +1060,7 @@ find_persistence_media ()
# in one union together.
#
black_listed_devices=""
- for d in /run/live/rootfs/* /live/findiso /live/fromiso
+ for d in /run/live/rootfs/* /run/live/findiso /run/live/fromiso
do
black_listed_devices="${black_listed_devices} $(what_is_mounted_on d)"
done