From dbc32c9e157ae184f5fe464f250f9f616e536e9f Mon Sep 17 00:00:00 2001 From: Ulrich Dangel Date: Sun, 12 Jun 2011 05:16:09 +0200 Subject: [PATCH] Revert "support DNS in boot environment" This reverts commit 10caf0b2db3fc04fae24ca896cf21f6aed12bbbc. This is now an extra patch --- hooks/live | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/hooks/live b/hooks/live index 3862a60..309c26f 100755 --- a/hooks/live +++ b/hooks/live @@ -252,14 +252,17 @@ then manual_add_modules crc32c fi -# DNS for initramfs -#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 +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 +fi if [ "${LIVE_UNIONMOUNT}" = "true" ] then -- 2.1.4