X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fpatches%2F29_support_dns_in_initramfs.patch;h=501c607a85affda7e5b27b1b400d650ea326476a;hb=4ab3bcb19af44f09ab482a00993bea892ef70230;hp=856913da3243649652fc4a5e15d682429850407e;hpb=bc1b3916313d325ce0a2c7b67c1f19498238c44e;p=live-boot-grml.git

diff --git a/debian/patches/29_support_dns_in_initramfs.patch b/debian/patches/29_support_dns_in_initramfs.patch
index 856913d..501c607 100644
--- a/debian/patches/29_support_dns_in_initramfs.patch
+++ b/debian/patches/29_support_dns_in_initramfs.patch
@@ -6,30 +6,45 @@ Date:   Fri Mar 25 23:02:38 2011 +0100
     
     Thanks to Ulrich Dangel for discovering this. [Closes: issue848]
 
---- a/hooks/live
-+++ b/hooks/live
-@@ -258,17 +258,14 @@
- 	manual_add_modules crc32c
- fi
+Index: live-boot-grml/backend/initramfs-tools/live.hook
+===================================================================
+--- live-boot-grml.orig/backend/initramfs-tools/live.hook	2014-03-08 13:36:37.835196873 +0100
++++ live-boot-grml/backend/initramfs-tools/live.hook	2014-03-08 13:36:37.835196873 +0100
+@@ -228,23 +228,19 @@
  
--if [ "${LIVE_DNS}" = "true" ]
--then
--	[ "${QUIET}" ] || echo -n " "dns
--	#copy_exec /lib/libnss_files.so.*      /lib  # /etc/hosts and /etc/passwd
--	copy_exec /lib/libnss_dns.so.*      /lib  # DNS server
--	#copy_exec /lib/libnss_compat.so.*      /lib  # /etc/passwd
-+# DNS for initramfs
-+#copy_exec /lib/libnss_files.so.*      /lib  # /etc/hosts and /etc/passwd
-+copy_exec /lib/libnss_dns.so.*      /lib  # DNS server
-+#copy_exec /lib/libnss_compat.so.*      /lib  # /etc/passwd
+ # Some experimental stuff
  
--	# Configuration file - may be needed if /etc/hosts is used.
--	#mkdir -p $DESTDIR/etc
--	#cp -p /etc/nsswitch.conf $DESTDIR/etc
--fi
-+# Configuration file - may be needed if /etc/hosts is used.
-+#mkdir -p $DESTDIR/etc
-+#cp -p /etc/nsswitch.conf $DESTDIR/etc
+-case "${LIVE_DNS}" in
+-	true)
+-		[ "${QUIET}" ] || echo -n " dns"
+-
+-		# /lib/libnss_dns.so.*:a   DNS
+-		# /lib/libnss_files.so.*:  /etc/hosts and /etc/passwd
+-		# /lib/libnss_compat.so.*: /etc/passwd
+-
+-		for _SHLIB in $(find /lib -name 'libnss_dns.so.*')
+-		do
+-			copy_exec "${_SHLIB}"
+-		done
+-
+-		# might be needed if /etc/hosts is used
+-		#mkdir -p "${DESTDIR}/etc"
+-		#cp -p /etc/nsswitch.conf "${DESTDIR}/etc"
+-		;;
+-esac
++[ "${QUIET}" ] || echo -n " dns"
++
++# /lib/libnss_dns.so.*:a   DNS
++# /lib/libnss_files.so.*:  /etc/hosts and /etc/passwd
++# /lib/libnss_compat.so.*: /etc/passwd
++
++for _SHLIB in $(find /lib -name 'libnss_dns.so.*')
++do
++	copy_exec "${_SHLIB}"
++done
++
++# might be needed if /etc/hosts is used
++#mkdir -p "${DESTDIR}/etc"
++#cp -p /etc/nsswitch.conf "${DESTDIR}/etc"
  
- if [ "${LIVE_UNIONMOUNT}" = "true" ]
- then
+ [ "${QUIET}" ] || echo .