changelog entry

[live-boot-grml.git] / debian / patches / 29_support_dns_in_initramfs.patch

diff --git a/debian/patches/29_support_dns_in_initramfs.patch b/debian/patches/29_support_dns_in_initramfs.patch
index 6581160..f481eea 100644 (file)
--- a/debian/patches/29_support_dns_in_initramfs.patch
+++ b/debian/patches/29_support_dns_in_initramfs.patch
@@ -6,41 +6,50 @@ 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
-@@ -217,24 +217,20 @@ fi
+--- 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
-+# /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
-+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
  
- case "${LIVE_UNIONMOUNT}" in
-       true)
+ [ "${QUIET}" ] || echo .