From bbf81d50d3e3dba423dd3748c17727f60c874d31 Mon Sep 17 00:00:00 2001 From: Ulrich Dangel Date: Sun, 12 Jun 2011 05:11:22 +0200 Subject: [PATCH] Revert "Do not fail in multiarch environment when installing libnss_dns.so." This reverts commit 6666658535b255cb71d48ddeb415aeb3023e1251. The patch will be in an extra patch file --- hooks/live | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/hooks/live b/hooks/live index b3de1e5..3862a60 100755 --- a/hooks/live +++ b/hooks/live @@ -254,16 +254,7 @@ fi # DNS for initramfs #copy_exec /lib/libnss_files.so.* /lib # /etc/hosts and /etc/passwd -# DNS server: -if ls /lib/libnss_dns.so.* >/dev/null 2>&1 ; then # non-multiarch libc - copy_exec /lib/libnss_dns.so.* /lib -elif ls /lib/*/libnss_dns.so.* >/dev/null 2>&1 ; then # multiarch libc - for libnss in /lib/*/libnss_dns.so.* ; do - copy_exec "$libnss" - done -else - echo "Warning: libnss_dns.so.* not found. DNS in initramfs not functional." -fi +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. -- 2.1.4