X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FDEBIAN%2F30-interface;h=3d4d08fb63f4ba7ea7e4f48b847a8165c80ae35d;hb=a2d5a9fa8af23a2af6b97a55d87b6591d212fe2d;hp=9883731fd90efbaa728267d099d3755e6ebc554e;hpb=a6f3eaed0a1eebb5c58853fb9faa8bfbec404de3;p=automated-distro-installer

diff --git a/fai/config/scripts/DEBIAN/30-interface b/fai/config/scripts/DEBIAN/30-interface
index 9883731..3d4d08f 100755
--- a/fai/config/scripts/DEBIAN/30-interface
+++ b/fai/config/scripts/DEBIAN/30-interface
@@ -1,26 +1,45 @@
 #! /bin/bash
 
+# modified from upstream fai example
 error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
 
 if ifclass DHCPC && [ $FAI_ACTION = "install" -o $FAI_ACTION = "dirinstall" ]
 then
-    cat > $target/etc/network/interfaces <<-EOF
-	# generated by FAI
-	auto lo $NIC1
-	iface lo inet loopback
-	iface $NIC1 inet dhcp
+    if ifclass VM; then
+        cat > $target/etc/network/interfaces <<-EOF
+        # generated by FAI
+        auto lo $NIC1
+        iface lo inet loopback
+        iface $NIC1 inet dhcp
 EOF
+    else
+        cat > $target/etc/network/interfaces <<-EOF
+        # generated by FAI
+        auto lo br0
+        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 $NIC1
+          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
-	  gateway $GATEWAYS
+    [ -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
+          gateway $GATEWAYS
 EOF
     [ -n "$NETWORK" ] && echo "localnet $NETWORK" > $target/etc/networks
     if [ ! -L $target/etc/resolv.conf -a -e /etc/resolv.conf ]; then