Support isofrom/fromiso bootoption

diff --git a/debian/changelog b/debian/changelog
index 7dce953..609d23e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ live-initramfs (1.139.1-4grml.01) unstable; urgency=low
   * Ignore errors from fstype.
   * Display "Mounted live system on ..." during bootup.
   * Fix the "cannot open /dev/scd0: No medium found" issue.
+  * Support isofrom/fromiso bootoption.
 
- -- Michael Prokop <mika@grml.org>  Sat, 15 Nov 2008 11:46:23 +0100
+ -- Michael Prokop <mika@grml.org>  Mon, 17 Nov 2008 10:44:13 +0100
 
 live-initramfs (1.139.1-2grml.01) unstable; urgency=low
 

diff --git a/debian/patches/00list b/debian/patches/00list
index 8ef5a62..85ceb69 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -3,3 +3,4 @@
 03_grml_version_file_hook.dpatch
 04_fix_no_medium_found_error.dpatch
 05_boot_failure_message_grml.dpatch
+06_support_fromiso_isofrom.dpatch

diff --git a/debian/patches/06_support_fromiso_isofrom.dpatch b/debian/patches/06_support_fromiso_isofrom.dpatch
new file mode 100755 (executable)
index 0000000..521ec56
--- /dev/null
+++ b/debian/patches/06_support_fromiso_isofrom.dpatch
@@ -0,0 +1,40 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_support_fromiso_isofrom.dpatch <mika@grml.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Support isofrom / fromiso bootoption
+
+@DPATCH@
+
+--- a/scripts/live
++++ b/scripts/live
+@@ -92,6 +92,11 @@ Arguments ()
+                               export HOSTNAME LIVECONF
+                               ;;
+ 
++                      isofrom=*|fromiso=*)
++                              FROMISO="${ARGUMENT#*=}"
++                              export FROMISO
++                              ;;
++
+                       username=*)
+                               USERNAME="${ARGUMENT#username=}"
+                               LIVECONF="changed"
+@@ -1300,6 +1305,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}")