From c9ff5aa627e4f51b98c9af9f8f897bd7f8511aa7 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 5 Aug 2012 13:34:38 +0200 Subject: Adding slightly modified patch from Steven Shiau to transition to /run for network interface definition files which fixes resolv.conf creation for netboot. --- scripts/boot/9990-networking.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'scripts/boot/9990-networking.sh') 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 -- cgit v1.2.3