projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Using fromiso in most places where isofrom was used, thanks to adrian15 <adrian15sgd...
[live-boot-grml.git]
/
scripts
/
live
diff --git
a/scripts/live
b/scripts/live
index
f25fbad
..
9cef068
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-1255,15
+1255,15
@@
check_dev ()
if [ "$ISO_DEVICE" = "/" ]
then
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
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||")"
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
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
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}" ]
fi
if [ -n "${MODULETORAMFILE}" ] || [ -n "${PLAIN_ROOT}" ]