From 85fbb23edd4eb450f3180e3bfb51245e4da4d56d Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 20 Aug 2010 12:35:43 -0700 Subject: configure_networking(): Look for presence of /tmp/net-*.conf files when $DEVICE is not set (which is now default), otherwise ipconfig may receive a valid DHCP response, but fails to break out of the loop and is called repeatedly. thanks to Petter Reinholdtsen, i think i've figured out the initramfs-tools portion of this problem (there may still be outstanding issues with ipconfig). tested the attached patch, which seems to address the issue for me at least. Closes: #584583 Signed-off-by: maximilian attems --- scripts/functions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/functions') diff --git a/scripts/functions b/scripts/functions index 1e2aeee..419203a 100644 --- a/scripts/functions +++ b/scripts/functions @@ -372,9 +372,9 @@ configure_networking() # The NIC is to be configured if this file does not exist. # Ip-Config tries to create this file and when it succeds # creating the file, ipconfig is not run again. - if [ -e /tmp/net-"${DEVICE}".conf ]; then - break; - fi + for x in /tmp/net-"${DEVICE}".conf /tmp/net-*.conf ; do + [ -e "$x" ] && break 2 + done case ${IP} in none|off) -- cgit v1.2.3