projects
/
live-boot-grml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
75340e1
)
Adding support for isofrom/fromiso bootoption.
author
Michael Prokop
<mika@grml.org>
Mon, 26 Oct 2009 11:47:20 +0000
(12:47 +0100)
committer
Daniel Baumann
<daniel@debian.org>
Sun, 31 Jan 2010 12:54:56 +0000
(13:54 +0100)
scripts/live
patch
|
blob
|
history
diff --git
a/scripts/live
b/scripts/live
index
0fa3900
..
fa76eb1
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-97,6
+97,11
@@
Arguments ()
export HOSTNAME LIVECONF
;;
export HOSTNAME LIVECONF
;;
+ isofrom=*|fromiso=*)
+ FROMISO="${ARGUMENT#*=}"
+ export FROMISO
+ ;;
+
username=*)
USERNAME="${ARGUMENT#username=}"
LIVECONF="changed"
username=*)
USERNAME="${ARGUMENT#username=}"
LIVECONF="changed"
@@
-1384,6
+1389,17
@@
check_dev ()
devname="${2}"
skip_uuid_check="${3}"
devname="${2}"
skip_uuid_check="${3}"
+ # support for fromiso=.../isofrom=....
+ if [ -n "$FROMISO" ]
+ then
+ mkdir /isofrom
+ ISO_DEVICE="$(echo $FROMISO | sed 's|\(/dev/[a-z]*[0-9]*\).*|\1|')"
+ mount "$ISO_DEVICE" /isofrom
+ ISO_NAME="$(echo $FROMISO | sed 's|/dev/[a-z]*[0-9]*/||')"
+ loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
+ devname="${loopdevname}"
+ fi
+
if [ -z "${devname}" ]
then
devname=$(sys2dev "${sysdev}")
if [ -z "${devname}" ]
then
devname=$(sys2dev "${sysdev}")
@@
-1655,6
+1671,15
@@
mountroot ()
log_end_msg
fi
log_end_msg
fi
+ # if we do not unmount the ISO we can't run "fsck /dev/ice" later on
+ # because the mountpoint is left behind in /proc/mounts, so let's get
+ # rid of it when running from RAM
+ if [ -n "$FROMISO" ] && [ "${TORAM}" ]
+ then
+ losetup -d /dev/loop0
+ grep -q /isofrom /proc/mounts && umount /isofrom
+ fi
+
if [ -n "${MODULETORAMFILE}" ] || [ -n "${PLAIN_ROOT}" ]
then
setup_unionfs "${livefs_root}" "${rootmnt}"
if [ -n "${MODULETORAMFILE}" ] || [ -n "${PLAIN_ROOT}" ]
then
setup_unionfs "${livefs_root}" "${rootmnt}"