X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fpatches%2F29_support_dns_in_initramfs.patch;h=f481eea5a24bab507c2e9c14e2385cafe2aed731;hb=fdf285d157bf1558728e0b6b6bea3b4f78a7b108;hp=b4b3cb5f3ec5dd8bc865159483e2617ab9ab5124;hpb=1aa780ac2a7a1b66d33ac1e142d84ff149b5edf0;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 b4b3cb5..f481eea 100644
--- a/debian/patches/29_support_dns_in_initramfs.patch
+++ b/debian/patches/29_support_dns_in_initramfs.patch
@@ -6,17 +6,16 @@ Date:   Fri Mar 25 23:02:38 2011 +0100
     
     Thanks to Ulrich Dangel for discovering this. [Closes: issue848]
 
---- a/backends/initramfs-tools/live.hook
-+++ b/backends/initramfs-tools/live.hook
-@@ -223,24 +223,20 @@
+--- a/backend/initramfs-tools/live.hook
++++ b/backend/initramfs-tools/live.hook
+@@ -228,23 +228,26 @@
  
  # Some experimental stuff
  
 -case "${LIVE_DNS}" in
 -	true)
 -		[ "${QUIET}" ] || echo -n " dns"
-+[ "${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
@@ -31,6 +30,8 @@ Date:   Fri Mar 25 23:02:38 2011 +0100
 -		#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
@@ -43,6 +44,12 @@ Date:   Fri Mar 25 23:02:38 2011 +0100
 +# 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
  
- case "${LIVE_UNIONMOUNT}" in
- 	true)
+ [ "${QUIET}" ] || echo .