Integrate debian/patches/03_grml_version_file_hook.dpatch, rename 02_more_verbose_tor...
authorMichael Prokop <devnull@localhost>
Mon, 25 Aug 2008 13:33:38 +0000 (15:33 +0200)
committerMichael Prokop <devnull@localhost>
Mon, 25 Aug 2008 13:33:38 +0000 (15:33 +0200)
debian/changelog
debian/patches/00list
debian/patches/02_more_verbose_toram.dpatch [moved from debian/patches/02_more_verbose_toram.diff with 100% similarity]
debian/patches/03_grml_version_file_hook.dpatch [new file with mode: 0755]

index 74fc844..bbe3c1b 100644 (file)
@@ -3,8 +3,9 @@ live-initramfs (1.139.1-2~grml.01) unstable; urgency=low
   * Resync with Debian's 1.139.1-1 version.
     [Closes: issue497]
   * Drop debian/patches/03_fix_cow_tmpfs_mount.dpatch.
+  * Integrate debian/patches/03_grml_version_file_hook.dpatch.
 
- -- Michael Prokop <mika@grml.org>  Mon, 25 Aug 2008 14:32:19 +0200
+ -- Michael Prokop <mika@grml.org>  Mon, 25 Aug 2008 14:38:53 +0200
 
 live-initramfs (1.136.3-2~grml.04) unstable; urgency=low
 
index 7af8eb4..5e8c852 100644 (file)
@@ -1,4 +1,5 @@
 01_add_rsync.dpatch
 02_more_verbose_toram.diff
+03_grml_version_file_hook.dpatch
 04_get_rid_of_utillinux-mountbinary.dpatch
 05_boot_failure_message_grml.dpatch
diff --git a/debian/patches/03_grml_version_file_hook.dpatch b/debian/patches/03_grml_version_file_hook.dpatch
new file mode 100755 (executable)
index 0000000..969ea22
--- /dev/null
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_grml_version_file_hook.dpatch by <mika@grml.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Copy /etc/grml_version to initrd
+
+@DPATCH@
+
+diff -r 57ad7f467063 hooks/live
+--- a/hooks/live       Mon Aug 25 14:32:31 2008 +0200
++++ b/hooks/live       Mon Aug 25 14:36:35 2008 +0200
+@@ -33,6 +33,11 @@
+       mkdir -p "${DESTDIR}"/etc
+       cp /etc/live.conf "${DESTDIR}"/etc
++fi
++
++# Grml version information:
++if [ -r /etc/grml_version ] ; then
++   cp /etc/grml_version "${DESTDIR}"/etc
+ fi
+ # Directories