Skip to content

Commit

Permalink
Using fromiso in most places where isofrom was used, thanks to adrian…
Browse files Browse the repository at this point in the history
…15 <adrian15sgd@gmail.com>.
  • Loading branch information
Tails developers authored and daniel-baumann committed Jun 4, 2012
1 parent 285412f commit 149e490
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions scripts/live
Expand Up @@ -1255,15 +1255,15 @@ check_dev ()

if [ "$ISO_DEVICE" = "/" ]
then
echo "Warning: device for bootoption isofrom= ($FROMISO) not found.">>/live-boot.log
echo "Warning: device for bootoption fromiso= ($FROMISO) not found.">>/live-boot.log
else
fs_type=$(get_fstype "${ISO_DEVICE}")
if is_supported_fs ${fs_type}
then
mkdir /isofrom
mount -t $fs_type "$ISO_DEVICE" /isofrom
mkdir /fromiso
mount -t $fs_type "$ISO_DEVICE" /fromiso
ISO_NAME="$(echo $FROMISO | sed "s|$ISO_DEVICE||")"
loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
loopdevname=$(setup_loop "/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 /isofrom /proc/mounts && umount /isofrom
grep -q /fromiso /proc/mounts && umount /fromiso
fi

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

0 comments on commit 149e490

Please sign in to comment.