minor: update interfaces to match upstream

diff --git a/fai/config/scripts/DEBIAN/30-interface b/fai/config/scripts/DEBIAN/30-interface
index 12672f1ff4f7f18781c5e94e8038abb054383fe9..3d4d08fb63f4ba7ea7e4f48b847a8165c80ae35d 100755 (executable)
--- 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 3b9ab80f14fef060f1dc20ac94bf48698e127922..0510b407a4a9117d4ea5c060104dc2d0696335a0 100755 (executable)
--- 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