[SCM] live-boot branch, debian-next, updated. debian/3.0_a38-1-3-g3c99637

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 3c996374d7354587d1e0597ca0a275c7d8f7f4f4
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Aug 5 13:34:38 2012 +0200

    Adding slightly modified patch from Steven Shiau <steven at nchc.org.tw> to transition to /run for network interface definition files which fixes resolv.conf creation for netboot.

diff --git a/scripts/boot/9990-networking.sh b/scripts/boot/9990-networking.sh
index 8c8d840..f32ae6c 100755
--- a/scripts/boot/9990-networking.sh
+++ b/scripts/boot/9990-networking.sh
@@ -110,7 +110,13 @@ do_netsetup ()
 	else
 		for interface in ${DEVICE}; do
 			ipconfig -t "$ETHDEV_TIMEOUT" ${interface} | tee /netboot-${interface}.config
+
+			# squeeze
 			[ -e /tmp/net-${interface}.conf ] && . /tmp/net-${interface}.conf
+
+			# wheezy
+			[ -e /run/net-${interface}.conf ] && . /run/net-${interface}.conf
+
 			if [ "$IPV4ADDR" != "0.0.0.0" ]
 			then
 				break
@@ -122,7 +128,13 @@ do_netsetup ()
 	do
 		# source relevant ipconfig output
 		OLDHOSTNAME=${HOSTNAME}
+
+		# squeeze
 		[ -e /tmp/net-${interface}.conf ] && . /tmp/net-${interface}.conf
+
+		# wheezy
+		[ -e /run/net-${interface}.conf ] && . /run/net-${interface}.conf
+
 		[ -z ${HOSTNAME} ] && HOSTNAME=${OLDHOSTNAME}
 		export HOSTNAME
 

-- 
live-boot