refresh patches against Debian's 3.0~b6-1

[live-boot-grml.git] / debian / patches / 30_support_multiarch_dns.patch

diff --git a/debian/patches/30_support_multiarch_dns.patch b/debian/patches/30_support_multiarch_dns.patch
deleted file mode 100644 (file)
index 599a91b..0000000
--- a/debian/patches/30_support_multiarch_dns.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 6666658535b255cb71d48ddeb415aeb3023e1251
-Author: Michael Prokop <mika@grml.org>
-Date:   Tue Jun 7 10:15:52 2011 +0200
-
-    Do not fail in multiarch environment when installing libnss_dns.so.
-    
-    Updating initramfs fails with:
-    
-    | live-boot: core filesystems devices utils:memdisk udev wget blockdevE: /usr/share/initramfs-tools/hooks/live failed with return 1.
-    
-    with multiarch libc because the filename is no longer necessarily
-    /lib/libnss_dns.so.* but could also be e.g.
-    /lib/x86_64-linux-gnu/libnss_dns.so.*.
-
-Index: live-boot-grml/hooks/live
-===================================================================
---- live-boot-grml.orig/hooks/live     2011-12-06 22:10:47.000000000 +0100
-+++ live-boot-grml/hooks/live  2011-12-06 22:10:55.000000000 +0100
-@@ -268,7 +268,16 @@
- 
- # DNS for initramfs
- #copy_exec /lib/libnss_files.so.*      /lib  # /etc/hosts and /etc/passwd
--copy_exec /lib/libnss_dns.so.*      /lib  # DNS server
-+# DNS server:
-+if ls /lib/libnss_dns.so.* >/dev/null 2>&1 ; then # non-multiarch libc
-+        copy_exec /lib/libnss_dns.so.*      /lib
-+elif ls /lib/*/libnss_dns.so.* >/dev/null 2>&1 ; then # multiarch libc
-+        for libnss in /lib/*/libnss_dns.so.* ; do
-+                copy_exec "$libnss"
-+        done
-+else
-+        echo "Warning: libnss_dns.so.* not found. DNS in initramfs not functional."
-+fi
- #copy_exec /lib/libnss_compat.so.*      /lib  # /etc/passwd
- 
- # Configuration file - may be needed if /etc/hosts is used.