1 #! /bin/sh /usr/share/dpatch/dpatch-run
2 ## 06_support_fromiso_isofrom.dpatch <mika@grml.org>
4 ## All lines beginning with `## DP:' are a description of the patch.
5 ## DP: Support isofrom / fromiso bootoption
11 @@ -92,6 +92,11 @@ Arguments ()
12 export HOSTNAME LIVECONF
15 + isofrom=*|fromiso=*)
16 + FROMISO="${ARGUMENT#*=}"
21 USERNAME="${ARGUMENT#username=}"
23 @@ -1339,6 +1344,17 @@ check_dev ()
25 skip_uuid_check="${3}"
27 + # support for fromiso=.../isofrom=....
28 + if [ -n "$FROMISO" ]
31 + ISO_DEVICE="$(echo $FROMISO | sed 's|\(/dev/[a-z]*[0-9]*\).*|\1|')"
32 + mount "$ISO_DEVICE" /isofrom
33 + ISO_NAME="$(echo $FROMISO | sed 's|/dev/[a-z]*[0-9]*/||')"
34 + loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
35 + devname="${loopdevname}"
38 if [ -z "${devname}" ]
40 devname=$(sys2dev "${sysdev}")
41 @@ -1609,6 +1625,15 @@ mountroot ()
45 + # if we do not unmount the ISO we can't run "fsck /dev/ice" later on
46 + # because the mountpoint is left behind in /proc/mounts, so let's get
47 + # rid of it when running from RAM
48 + if [ -n "$FROMISO" ] && [ "${TORAM}" ]
50 + losetup -d /dev/loop0
51 + grep -q /isofrom /proc/mounts && umount /isofrom
54 if [ -n "${MODULETORAMFILE}" ]
56 setup_unionfs "${livefs_root}" "${rootmnt}"