summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
be43356)
/live/fromiso was still used, switch to /run/live/fromiso to follow
changes from
0d878d3a6798 (see #886328).
then
losetup -d /dev/loop0
then
losetup -d /dev/loop0
- if is_mountpoint /live/fromiso
+ if is_mountpoint /run/live/fromiso
- 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
>/dev/null 2>&1 || true
fi
fi
fs_type=$(get_fstype "${ISO_DEVICE}")
if is_supported_fs ${fs_type}
then
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||")"
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
devname="${loopdevname}"
else
echo "Warning: unable to mount $ISO_DEVICE." >>/boot.log
# in one union together.
#
black_listed_devices=""
# 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
do
black_listed_devices="${black_listed_devices} $(what_is_mounted_on d)"
done