summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscripts/live11
-rwxr-xr-xscripts/live-bottom/23networking2
2 files changed, 12 insertions, 1 deletions
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"