[SCM] live-boot branch, debian-next, updated. debian/2.0_a4-1-6-ga52a651
Daniel Baumann
daniel at debian.org
Fri Jun 4 07:26:00 UTC 2010
The following commit has been merged in the debian-next branch:
commit a52a651cbf883bb836188dcc0f1f43a554824cc2
Author: Michal <hramrach at centrum.cz>
Date: Thu Jun 3 18:38:35 2010 +0200
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..e01acdf 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"
--
live-boot
More information about the debian-live-changes
mailing list