[SCM] live-initramfs branch, master, updated. 1.157.4-1-11-gfc2a897
Daniel Baumann
daniel at debian.org
Mon Oct 26 11:57:54 UTC 2009
The following commit has been merged in the master branch:
commit 6458a8862db683250ccd49215dabd11d27f4a73e
Author: Michael Prokop <mika at grml.org>
Date: Mon Oct 26 12:47:20 2009 +0100
Adding support for isofrom/fromiso bootoption.
diff --git a/scripts/live b/scripts/live
index 74ec8cc..e6fda49 100755
--- a/scripts/live
+++ b/scripts/live
@@ -97,6 +97,11 @@ Arguments ()
export HOSTNAME LIVECONF
;;
+ isofrom=*|fromiso=*)
+ FROMISO="${ARGUMENT#*=}"
+ export FROMISO
+ ;;
+
username=*)
USERNAME="${ARGUMENT#username=}"
LIVECONF="changed"
@@ -1384,6 +1389,17 @@ check_dev ()
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}")
@@ -1655,6 +1671,15 @@ mountroot ()
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}"
--
live-initramfs
More information about the debian-live-changes
mailing list