consolidate network related patches into 15_networking_grml.patch

[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 b4b3cb5..501c607 100644 (file)
--- a/debian/patches/29_support_dns_in_initramfs.patch
+++ b/debian/patches/29_support_dns_in_initramfs.patch
@@ -6,17 +6,18 @@ 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 @@
+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 @@
  
  # 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 +32,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
@@ -44,5 +47,4 @@ Date:   Fri Mar 25 23:02:38 2011 +0100
 +#mkdir -p "${DESTDIR}/etc"
 +#cp -p /etc/nsswitch.conf "${DESTDIR}/etc"
  
- case "${LIVE_UNIONMOUNT}" in
-       true)
+ [ "${QUIET}" ] || echo .