From: Ian Kelling Date: Tue, 9 Aug 2016 07:03:46 +0000 (-0700) Subject: minor: update interfaces to match upstream X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=a2d5a9fa8af23a2af6b97a55d87b6591d212fe2d;p=automated-distro-installer minor: update interfaces to match upstream --- diff --git a/fai/config/scripts/DEBIAN/30-interface b/fai/config/scripts/DEBIAN/30-interface index 12672f1..3d4d08f 100755 --- a/fai/config/scripts/DEBIAN/30-interface +++ b/fai/config/scripts/DEBIAN/30-interface @@ -7,7 +7,7 @@ if ifclass DHCPC && [ $FAI_ACTION = "install" -o $FAI_ACTION = "dirinstall" ] then if ifclass VM; then cat > $target/etc/network/interfaces <<-EOF - # installed by FAI + # generated by FAI auto lo $NIC1 iface lo inet loopback iface $NIC1 inet dhcp @@ -40,7 +40,6 @@ then netmask $NETMASK broadcast $BROADCAST gateway $GATEWAYS - hwaddress ether $(cat /sys/class/net/$NIC1/address) EOF [ -n "$NETWORK" ] && echo "localnet $NETWORK" > $target/etc/networks if [ ! -L $target/etc/resolv.conf -a -e /etc/resolv.conf ]; then diff --git a/faiserver-setup b/faiserver-setup index 3b9ab80..0510b40 100755 --- a/faiserver-setup +++ b/faiserver-setup @@ -63,7 +63,7 @@ service tftpd-hpa restart # Add debug to -f flag for more verbose output. std_arg="-u nfs://faiserver/srv/fai/config" -fai-chboot -Iv $std_arg default # reset so we are idempotent +e fai-chboot -Iv $std_arg default # reset so we are idempotent kernel=$(fai-chboot -L '^default$' | awk '{print $3}') type -t host &>/dev/null || apt-get -y install dnsutils # resolve host using gateway address