X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FDEBIAN%2F30-interface;h=3388dcf1d241bcc2f01df100161d6e0e3ff154d7;hb=a8ec695d6a39792133a21e9eca70e69f9fab107b;hp=f688fb398e74521344375d4051fc878275bdcc5d;hpb=f6b4ee45535883c942ad075998894a65a6453f07;p=automated-distro-installer

diff --git a/fai/config/scripts/DEBIAN/30-interface b/fai/config/scripts/DEBIAN/30-interface
index f688fb3..3388dcf 100755
--- a/fai/config/scripts/DEBIAN/30-interface
+++ b/fai/config/scripts/DEBIAN/30-interface
@@ -7,10 +7,10 @@ if ifclass DHCPC && [ $FAI_ACTION = "install" -o $FAI_ACTION = "dirinstall" ]
 then
     if ifclass VM; then
         cat > $target/etc/network/interfaces <<-EOF
-        # generated by FAI
-	auto lo $NIC1
-	iface lo inet loopback
-	iface $NIC1 inet dhcp
+        # installed by FAI
+        auto lo $NIC1
+        iface lo inet loopback
+        iface $NIC1 inet dhcp
 EOF
     else
         cat > $target/etc/network/interfaces <<-EOF
@@ -19,23 +19,26 @@ EOF
         iface lo inet loopback
         iface $NIC1 inet manual
         # make a bridge by default so we can have bridged vms.
+        # Some example I read had stp on, but i don't need stp,
+        # and it causes a vm to fail pxe boot, presumably unless
+        # 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_stp on
-               bridge_maxwait 0
-               bridge_fd 0
+          bridge_ports eth0
+          bridge_stp off
+          bridge_maxwait 0
 EOF
     fi
 elif [ $FAI_ACTION = "install" -o $FAI_ACTION = "dirinstall" ]
 then
     [ -n "$IPADDR" ] && cat > $target/etc/network/interfaces <<-EOF
         # generated by FAI
-	auto lo $NIC1
-	iface lo inet loopback
-	iface $NIC1 inet static
-	  address $IPADDR
-	  netmask $NETMASK
-	  broadcast $BROADCAST
+        auto lo $NIC1
+        iface lo inet loopback
+        iface $NIC1 inet static
+          address $IPADDR
+          netmask $NETMASK
+          broadcast $BROADCAST
           gateway $GATEWAYS
           hwaddress ether $(cat /sys/class/net/$NIC1/address)
 EOF