X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fboot%2F9990-networking.sh;h=d9607b795d1093b508bd07a0a624728f1fbaae8b;hb=66eca236cac88042f33cf50984fec5dde417894d;hp=8c8d8403e4e70ab3f7a9891d50f67a86ddabd783;hpb=3b0def1c54e6cd384d1514b26fbf28b091638808;p=live-boot-grml.git diff --git a/scripts/boot/9990-networking.sh b/scripts/boot/9990-networking.sh index 8c8d840..d9607b7 100755 --- a/scripts/boot/9990-networking.sh +++ b/scripts/boot/9990-networking.sh @@ -110,7 +110,9 @@ do_netsetup () else for interface in ${DEVICE}; do ipconfig -t "$ETHDEV_TIMEOUT" ${interface} | tee /netboot-${interface}.config - [ -e /tmp/net-${interface}.conf ] && . /tmp/net-${interface}.conf + + [ -e /run/net-${interface}.conf ] && . /run/net-${interface}.conf + if [ "$IPV4ADDR" != "0.0.0.0" ] then break @@ -122,7 +124,9 @@ do_netsetup () do # source relevant ipconfig output OLDHOSTNAME=${HOSTNAME} - [ -e /tmp/net-${interface}.conf ] && . /tmp/net-${interface}.conf + + [ -e /run/net-${interface}.conf ] && . /run/net-${interface}.conf + [ -z ${HOSTNAME} ] && HOSTNAME=${OLDHOSTNAME} export HOSTNAME