minor: update interfaces to match upstream

[automated-distro-installer] / fai / config / scripts / DEBIAN / 30-interface

diff --git a/fai/config/scripts/DEBIAN/30-interface b/fai/config/scripts/DEBIAN/30-interface
index 3388dcf1d241bcc2f01df100161d6e0e3ff154d7..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
@@ -24,7 +24,7 @@ EOF
         # you add some delay.
         # http://wiki.libvirt.org/page/PXE_boot_%28or_dhcp%29_on_guest_failed
         iface br0 inet dhcp
-          bridge_ports eth0
+          bridge_ports $NIC1
           bridge_stp off
           bridge_maxwait 0
 EOF
@@ -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