Merge ~mwhudson/ubuntu/+source/initramfs-tools:minimal-dhclient into ubuntu/+source/initramfs-tools:ubuntu/devel

[Michael Hudson-Doyle]

This is a very small change to start using dhclient to configure IPv4 addressing in some situations. I have a larger alternative I'll be proposing in a moment.

[Dimitri John Ledkov (xnox)]

This got also merged i think. please close the merge proposal.

[Michael Hudson-Doyle (mwhudson)]

I don't think this did get merged and I can't reject it. I guess I'll mark it merged anyway to get it off the active list.

diff --git a/scripts/functions b/scripts/functions
index 9b51c32..d71891b 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -323,7 +323,19 @@ configure_networking()
 			# Bring up device
 			ipconfig -t ${ROUNDTTT} "${DEVICE}"
 			;;
-		dhcp|bootp|rarp|both)
+		dhcp)
+			# if we don't have a device specified, try to bring up
+			# any eligible device.
+			if [ -z "${DEVICE}" ]; then
+				DEVICE=$(all_netbootable_devices)
+			fi
+
+			# Bring up device
+			for dev in ${DEVICE} ; do
+				dhclient -4 -1 -v "${dev}" && { DEVICE="${dev}"; break }
+			done
+			;;
+                bootp|rarp|both)
 			ipconfig -t ${ROUNDTTT} -c ${IP} -d "${DEVICE}"
 			;;
 		*)