Release new version 3.0~a17-1+grml.01.

[live-boot-grml.git] / hooks / live

diff --git a/hooks/live b/hooks/live
index 309c26f..b3de1e5 100755 (executable)
--- a/hooks/live
+++ b/hooks/live
@@ -252,17 +252,23 @@ then
        manual_add_modules crc32c
 fi
 
-if [ "${LIVE_DNS}" = "true" ]
-then
-       [ "${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
+# 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_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
 
 if [ "${LIVE_UNIONMOUNT}" = "true" ]
 then