X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=components%2F9990-netbase.sh;h=bae858a76236df22caa77367fb1c56ccee8cf190;hb=43b5c8a4df961f5346e2ce176d6efe7495ddff14;hp=70f97b8e6f8c8167a8a301b56b0badcf5fe7482f;hpb=f5716f9a79564e44e38f5d4164a4dc1d77cb8c3a;p=live-boot-grml.git

diff --git a/components/9990-netbase.sh b/components/9990-netbase.sh
index 70f97b8..bae858a 100755
--- a/components/9990-netbase.sh
+++ b/components/9990-netbase.sh
@@ -9,10 +9,6 @@ Netbase ()
 		return
 	fi
 
-	# FIXME: stop hardcoding overloading of initramfs-tools functions
-	. /scripts/functions
-	. /lib/live/boot/9990-initramfs-tools.sh
-
 	log_begin_msg "Preconfiguring networking"
 
 	IFFILE="/root/etc/network/interfaces"
@@ -80,7 +76,11 @@ EOF
 			fi
 		done
 	else
-		if [ -z "${NETBOOT}" ] || [ -n "${DHCP}" ]
+		if [ -n "${NODHCP}" ]
+		then
+			# force DHCP off
+			method="manual"
+		elif [ -z "${NETBOOT}" ] || [ -n "${DHCP}" ]
 		then
 			# default, dhcp assigned
 			method="dhcp"