X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fpatches%2F29_support_dns_in_initramfs.patch;h=f481eea5a24bab507c2e9c14e2385cafe2aed731;hb=fdf285d157bf1558728e0b6b6bea3b4f78a7b108;hp=e5414fd6410fb9079a43732feb059d83f8732465;hpb=11575c6aee0916c918b1e4e98731566d20586df9;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 e5414fd..f481eea 100644
--- a/debian/patches/29_support_dns_in_initramfs.patch
+++ b/debian/patches/29_support_dns_in_initramfs.patch
@@ -6,32 +6,50 @@ Date:   Fri Mar 25 23:02:38 2011 +0100
     
     Thanks to Ulrich Dangel for discovering this. [Closes: issue848]
 
-Index: live-boot-grml/hooks/live
-===================================================================
---- live-boot-grml.orig/hooks/live	2011-12-06 22:10:17.000000000 +0100
-+++ live-boot-grml/hooks/live	2011-12-06 22:10:47.000000000 +0100
-@@ -266,17 +266,14 @@
- 	manual_add_modules crc32c
- fi
+--- a/backend/initramfs-tools/live.hook
++++ b/backend/initramfs-tools/live.hook
+@@ -228,23 +228,26 @@
  
--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"
++
++# vlan support
++if [ -x /sbin/vconfig ]
++then
++	copy_exec /sbin/vconfig
++	manual_add_modules 8021q
++fi
  
- if [ "${LIVE_UNIONMOUNT}" = "true" ]
- then
+ [ "${QUIET}" ] || echo .