Update changelog for release 1.177.1-1grml.03.

diff --git a/debian/changelog b/debian/changelog
index 0db34ef..56494e0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+live-initramfs (1.177.1-1grml.03) unstable; urgency=low
+
+  * Avoid booting failures when kernel options like libata.dma=0
+    are present.
+
+ -- Michael Prokop <mika@grml.org>  Fri, 02 Apr 2010 13:40:04 +0200
+
 live-initramfs (1.177.1-1grml.02) unstable; urgency=low
 
   * aufs2 in kernel 2.6.33 has a regression with regards to

diff --git a/debian/patches/00list b/debian/patches/00list
index 2f254fb..fb6e178 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -8,3 +8,4 @@
 13_always_display_warnings_and_failures.dpatch
 14_prefer_removable_devices.dpatch
 15_support_cciss_in_isofrom.dpatch
+16_do_not_leak_modprobe_options.dpatch

diff --git a/debian/patches/16_do_not_leak_modprobe_options.dpatch b/debian/patches/16_do_not_leak_modprobe_options.dpatch
new file mode 100755 (executable)
index 0000000..b71da29
--- /dev/null
+++ b/debian/patches/16_do_not_leak_modprobe_options.dpatch
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 16_do_not_leak_modprobe_options.dpatch by Michael Prokop <mika@grml.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: do not leak modprobe options to avoid booting errors with
+## DP: kernel options like libata.dma=0
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' live-initramfs-grml~/scripts/live-helpers live-initramfs-grml/scripts/live-helpers
+--- live-initramfs-grml~/scripts/live-helpers  2010-03-30 13:53:44.000000000 +0200
++++ live-initramfs-grml/scripts/live-helpers   2010-04-02 13:38:42.152615342 +0200
+@@ -187,7 +187,11 @@
+       local encryption=${5}
+       local readonly=${6}
+ 
+-      modprobe -q -b "${module}"
++      # the output of setup_loop is evaluated in other functions,
++      # modprobe leaks kernel options like "libata.dma=0"
++      # as "options libata dma=0" on stdout, causing serious
++      # problems therefor, so instead always avoid output to stdout
++      modprobe -q -b "${module}" 1>/dev/null
+ 
+       udevadm settle
+