From 00b1535be06d4c045033a7f7b8a8226d44e40ded Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Tue, 13 Mar 2018 21:37:55 +0000 Subject: [PATCH] Fix fromiso after switch to /run/live /live/fromiso was still used, switch to /run/live/fromiso to follow changes from 0d878d3a6798 (see #886328). --- components/9990-main.sh | 6 +++--- components/9990-misc-helpers.sh | 8 ++++---- 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 60709de..23024eb 100755 --- a/components/9990-misc-helpers.sh +++ b/components/9990-misc-helpers.sh @@ -125,10 +125,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 @@ -1054,7 +1054,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 -- 2.1.4