X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fboot%2F9990-networking.sh;h=f32ae6c5abeb270b4f17da072c0f64a1a36dd801;hb=12987b7f06549a0b5e53872dce576e0c25a8827a;hp=8c8d8403e4e70ab3f7a9891d50f67a86ddabd783;hpb=a5b1590456c81bd559bb28e3baef6ddfe7aa6b38;p=live-boot-grml.git

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