Merge patches 05 and 06
authorMichael Prokop <devnull@localhost>
Sat, 16 Aug 2008 13:23:10 +0000 (15:23 +0200)
committerMichael Prokop <devnull@localhost>
Sat, 16 Aug 2008 13:23:10 +0000 (15:23 +0200)
debian/patches/00list
debian/patches/05_boot_failure_message_grml.dpatch [deleted file]
debian/patches/06_grml_version_file.dpatch [deleted file]

index 43774ce..b99df49 100644 (file)
@@ -3,4 +3,3 @@
 03_fix_cow_tmpfs_mount.dpatch
 04_get_rid_of_utillinux-mountbinary.dpatch
 05_boot_failure_message_grml.dpatch
-06_grml_version_file.dpatch
diff --git a/debian/patches/05_boot_failure_message_grml.dpatch b/debian/patches/05_boot_failure_message_grml.dpatch
deleted file mode 100755 (executable)
index 19a8d20..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 07_boot_failure_message_grml.diff.dpatch by  <mika@grml.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adjust message if booting fails
-
-@DPATCH@
-
---- a/scripts/live-functions   2008-08-16 01:53:16.000000000 +0200
-+++ b/scripts/live-functions   2008-08-16 10:35:25.000000000 +0200
-@@ -119,13 +119,17 @@
-       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"
--      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
-+           cat /etc/grml_version
-+           printf "\n"
-+        fi
-+
-       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"
-       printf "  extremely useful when diagnosing issues.\n\n"
diff --git a/debian/patches/06_grml_version_file.dpatch b/debian/patches/06_grml_version_file.dpatch
deleted file mode 100755 (executable)
index ad9b73c..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06_grml_version_file.dpatch.dpatch by  <mika@grml.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Copy /etc/grml_version to initrd
-
-@DPATCH@
-
---- 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"
--      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
-+           GRML_VERSION="$(cat /etc/grml_version)"
-+           printf "  $GRML_VERSION\n\n"
-+        fi
-       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"