From: Michal Suchanek <hramrach@centrum.cz>
Date: Fri, 4 Jun 2010 07:24:28 +0000 (+0200)
Subject: Adding DHCP debugging option.
X-Git-Tag: debian/2.0.15-1~109
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=762405f8bac3e19efe419aebf371be168aacf8cd;p=live-boot-grml.git

Adding DHCP debugging option.
---

diff --git a/scripts/live b/scripts/live
index 753fceb..5c6a82e 100755
--- a/scripts/live
+++ b/scripts/live
@@ -85,6 +85,17 @@ Arguments ()
 				set -x
 				;;
 
+			dhcp)
+				# Force dhcp even while netbooting
+				# Use for debugging in case somebody works on fixing dhclient
+				DHCP="Force";
+				export DHCP
+				;;
+
+			nodhcp)
+				unset DHCP
+				;;
+
 			ethdevice=*)
 				DEVICE="${ARGUMENT#ethdevice=}"
 				export DEVICE
diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
index d73f63b..871d8c0 100755
--- a/scripts/live-bottom/23networking
+++ b/scripts/live-bottom/23networking
@@ -71,7 +71,7 @@ EOF
 
 	done
 else
-	if [ -z "${NETBOOT}" ]
+	if [ -z "${NETBOOT}" ] || [ -n "${DHCP}" ]
 	then
 		# default, dhcp assigned
 		method="dhcp"