Adding slightly modified patch from Steven Shiau <steven@nchc.org.tw>…

… to transition to /run for network interface definition files which fixes resolv.conf creation for netboot.
grml · Aug 7, 2012 · c9ff5aa · c9ff5aa
1 parent c258d19
commit c9ff5aa
Showing 1 changed file with 12 additions and 0 deletions.
diff --git 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