Improve boot failure splash

diff --git a/debian/changelog b/debian/changelog
index e2053b0..18a9aca 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+live-initramfs (1.136.3-2~grml.03) unstable; urgency=low
+
+  * Improve boot failure splash.
+
+ -- Michael Prokop <mika@grml.org>  Sat, 16 Aug 2008 12:31:22 +0200
+
 live-initramfs (1.136.3-2~grml.02) unstable; urgency=low
 
   * Resync with Debian's current Git version [20080816,

diff --git a/debian/patches/06_grml_version_file.dpatch b/debian/patches/06_grml_version_file.dpatch
index 50bc2e9..ad9b73c 100644 (file)
--- a/debian/patches/06_grml_version_file.dpatch
+++ b/debian/patches/06_grml_version_file.dpatch
@@ -6,18 +6,25 @@
 
 @DPATCH@
 
-diff -r 9d601dc7dc9f hooks/live
---- a/hooks/live       Sat Aug 16 11:03:31 2008 +0200
-+++ b/hooks/live       Sat Aug 16 11:06:36 2008 +0200
-@@ -33,6 +33,11 @@
+--- a/scripts/live-functions   Sat Aug 16 11:12:23 2008 +0200
++++ b/scripts/live-functions   Sat Aug 16 11:50:30 2008 +0200
+@@ -119,12 +119,16 @@
+       printf "     ${DEB_1}\n"
+       printf "     ${DEB_2}  \033[1;37mBOOT FAILED!\033[0m\n"
+       printf "     ${DEB_3}\n"
+-      printf "     ${DEB_4}  This Debian Live image failed to boot.\n\n"
++      printf "     ${DEB_4}  This grml image failed to boot.\n\n"
  
-       mkdir -p "${DESTDIR}"/etc
-       cp /etc/live.conf "${DESTDIR}"/etc
-+fi
+-      printf "  Please file a bug against the 'live-initramfs' package or email the Debian\n"
+-      printf "  Live mailing list at <debian-live-devel@lists.alioth.debian.org>, making\n"
++      printf "  Please file a bug at http://grml.org/bugs/ or http://bts.grml.org/, making\n"
+       printf "  sure to note the exact version, name and distribution of the image you were\n"
+       printf "  attempting to boot.\n\n"
 +
-+if [ -r /etc/grml_version ]
-+then
-+      cp /etc/grml_version "${DESTDIR}"/etc
- fi
++        if [ -r /etc/grml_version ] ; then
++           GRML_VERSION="$(cat /etc/grml_version)"
++           printf "  $GRML_VERSION\n\n"
++        fi
  
- # Directories
+       printf "  The file ${LIVELOG} contains some debugging information but booting with the\n"
+       printf "  ${DEBUG} command-line parameter will greatly increase its verbosity which is\n"