diff options
| author | Tails developers <amnesia@boum.org> | 2012-04-10 11:43:30 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-06-04 17:39:49 +0200 |
| commit | 149e490b0d32724090f135f4654292231e6f28d6 (patch) | |
| tree | 149bbf56e7ccafe7c503fdea60bf32e7bf1b132e | |
| parent | 285412f944154e428f9da10f0e270aa85afe9276 (diff) | |
| download | live-boot-149e490b0d32724090f135f4654292231e6f28d6.tar.gz live-boot-149e490b0d32724090f135f4654292231e6f28d6.zip | |
Using fromiso in most places where isofrom was used, thanks to adrian15 <adrian15sgd@gmail.com>.
| -rwxr-xr-x | scripts/live | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/live b/scripts/live index f25fbad..9cef068 100755 --- a/scripts/live +++ b/scripts/live @@ -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 @@ -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}" ] |