X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F23networking;h=871d8c0b84c74f0e9a70764bfa0995ff783330fd;hb=b6e6b378482d5d5573679705d6cb0bfd51a9a61f;hp=4ebb944659720a322c5463ae5353f7a7e4816def;hpb=15eba58b6d201ca6881f2d96753381afc0039cc8;p=live-boot-grml.git

diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
index 4ebb944..871d8c0 100755
--- a/scripts/live-bottom/23networking
+++ b/scripts/live-bottom/23networking
@@ -18,7 +18,7 @@ case "${1}" in
 		;;
 esac
 
-# live-initramfs header
+# live-boot header
 
 if [ -n "${NONETWORKING}" ]
 then
@@ -29,7 +29,7 @@ fi
 
 log_begin_msg "Preconfiguring networking"
 
-# live-initramfs script
+# live-boot script
 
 IFFILE="/root/etc/network/interfaces"
 
@@ -71,7 +71,7 @@ EOF
 
 	done
 else
-	if [ -z "${NETBOOT}" ]
+	if [ -z "${NETBOOT}" ] || [ -n "${DHCP}" ]
 	then
 		# default, dhcp assigned
 		method="dhcp"
@@ -119,7 +119,7 @@ EOF
 
 cat > /root/etc/resolv.conf << EOF
 # /etc/resolv.conf
-# Autogenerated by live-initramfs
+# Autogenerated by live-boot
 search ${rc_search}
 domain ${rc_search}
 ${rc_server0}