[SCM] live-boot branch, debian-next, updated. debian/3.0_a38-1-8-geeb372f

Daniel Baumann daniel at debian.org
Tue Aug 14 18:26:58 UTC 2012


The following commit has been merged in the debian-next branch:
commit eeb372f937d3aad92d889f457ffad6e807d7dc23
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Aug 14 20:26:57 2012 +0200

    Correcting DNS inclusion in initramfs-tools hook, thanks to Steven Shiau <steven at nchc.org.tw> for reporting.

diff --git a/backends/initramfs-tools/live.hook b/backends/initramfs-tools/live.hook
index 78aae2e..df1a86c 100755
--- a/backends/initramfs-tools/live.hook
+++ b/backends/initramfs-tools/live.hook
@@ -225,13 +225,18 @@ case "${LIVE_DNS}" in
 	true)
 		[ "${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
-
-		# Configuration file - may be needed if /etc/hosts is used.
-		#mkdir -p $DESTDIR/etc
-		#cp -p /etc/nsswitch.conf $DESTDIR/etc
+		# /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
 

-- 
live-boot



More information about the debian-live-changes mailing list