Disable use of util-linux mount binary

diff --git a/debian/changelog b/debian/changelog
index bfffa85..423e127 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+live-initramfs (1.136.3-2~grml.01) unstable; urgency=low
+
+  * Disable use of util-linux's mount binary through
+    06_get_rid_of_utillinux-mountbinary.dpatch which
+    gets rid of /sbin/mount.cifs. See
+    http://news.gmane.org/gmane.linux.utilities.util-linux-ng/cutoff=1568
+    for more details about the problem.
+
+ -- Michael Prokop <mika@grml.org>  Fri, 01 Aug 2008 16:09:58 +0200
+
 live-initramfs (1.136.3-2~grml.00) unstable; urgency=low
 
   * Sync with Debian [1.136.3-1] once more (no new

diff --git a/debian/patches/00list b/debian/patches/00list
index 83c4c0b..3f70523 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -2,3 +2,4 @@
 02_more_verbose_toram.diff
 04_fix_cow_tmpfs_mount.dpatch
 05_get_rid_of_wrong_debug_message.dpatch
+06_get_rid_of_utillinux-mountbinary.dpatch

diff --git a/debian/patches/06_get_rid_of_utillinux-mountbinary.dpatch b/debian/patches/06_get_rid_of_utillinux-mountbinary.dpatch
new file mode 100644 (file)
index 0000000..d5f5bce
--- /dev/null
+++ b/debian/patches/06_get_rid_of_utillinux-mountbinary.dpatch
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_get_rid_of_utillinux-mountbinary.dpatch.dpatch by  <mika@grml.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Get rid of util-linux mount binary
+
+@DPATCH@
+
+diff -r 9c83db37b8d9 hooks/live
+--- a/hooks/live       Sun Jul 20 19:19:41 2008 +0200
++++ b/hooks/live       Fri Aug 01 16:07:05 2008 +0200
+@@ -74,11 +74,11 @@
+ fi
+ 
+ # Filesystem: cifs
+-if [ -x /sbin/mount.cifs ]
+-then
+-      copy_exec /sbin/mount.cifs /sbin
+-        manual_add_modules cifs
+-fi
++#if [ -x /sbin/mount.cifs ]
++#then
++#     copy_exec /sbin/mount.cifs /sbin
++#        manual_add_modules cifs
++#fi
+ 
+ # Filesystem: ext3
+ manual_add_modules ext3