Skip to content

Commit

Permalink
Mounting fromiso filesystem on /live/fromiso instead of /fromiso, tha…
Browse files Browse the repository at this point in the history
…nks to adrian15 <adrian15sgd@gmail.com>.
  • Loading branch information
Tails developers authored and daniel-baumann committed Jun 4, 2012
1 parent 149e490 commit 204da27
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions scripts/live
Expand Up @@ -1260,10 +1260,10 @@ check_dev ()
fs_type=$(get_fstype "${ISO_DEVICE}")
if is_supported_fs ${fs_type}
then
mkdir /fromiso
mount -t $fs_type "$ISO_DEVICE" /fromiso
mkdir /live/fromiso
mount -t $fs_type "$ISO_DEVICE" /live/fromiso
ISO_NAME="$(echo $FROMISO | sed "s|$ISO_DEVICE||")"
loopdevname=$(setup_loop "/fromiso/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
loopdevname=$(setup_loop "/live/fromiso/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
devname="${loopdevname}"
else
echo "Warning: unable to mount $ISO_DEVICE." >>/live-boot.log
Expand Down Expand Up @@ -1596,7 +1596,7 @@ mountroot ()
if [ -n "$FROMISO" ] && [ "${TORAM}" ]
then
losetup -d /dev/loop0
grep -q /fromiso /proc/mounts && umount /fromiso
grep -q /live/fromiso /proc/mounts && umount /live/fromiso
fi

if [ -n "${MODULETORAMFILE}" ] || [ -n "${PLAIN_ROOT}" ]
Expand Down

0 comments on commit 204da27

Please sign in to comment.