[SCM] live-initramfs branch, debian, updated. debian/1.199.1-1-18-g36e5948

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 02bfe70cc41247a681b473f6902abe7eabc54cf2
Author: Steven Shiau <steven at nchc.org.tw>
Date:   Sun May 2 15:51:10 2010 +0200

    No timeout as running ipconfig for network booting.

diff --git a/scripts/live b/scripts/live
index 3ef4ef0..6f4f5c1 100755
--- a/scripts/live
+++ b/scripts/live
@@ -780,6 +780,10 @@ do_netmount ()
 	udevadm trigger
 	udevadm settle
 
+	if [ -z "${NETBOOT}" ] && [ -z "${FETCH}" ] && \
+	   [ -z "${HTTPFS}" ] && [ -z "${FTPFS}" ]
+	then
+
 	# if ethdevice was not specified on the kernel command line
 	# make sure we try to get a working network configuration
 	# for *every* present network device (except for loopback of course)
@@ -823,6 +827,10 @@ do_netmount ()
 		fi
 	done
 
+	else
+	ipconfig ${DEVICE} | tee /netboot.config
+	fi
+
 	# source relevant ipconfig output
 	OLDHOSTNAME=${HOSTNAME}
 	. /tmp/net-${DEVICE}.conf

-- 
live-initramfs