diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-08-05 13:34:38 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-08-07 07:19:56 +0200 |
| commit | c9ff5aa627e4f51b98c9af9f8f897bd7f8511aa7 (patch) | |
| tree | 06c6ed78330a97251928b8cc65219ec212d16c25 | |
| parent | c258d199b505b6c31a907a3935230b94039be3ba (diff) | |
| download | live-boot-c9ff5aa627e4f51b98c9af9f8f897bd7f8511aa7.tar.gz live-boot-c9ff5aa627e4f51b98c9af9f8f897bd7f8511aa7.zip | |
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.
| -rwxr-xr-x | scripts/boot/9990-networking.sh | 12 |
1 files changed, 12 insertions, 0 deletions
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 |