X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FDEBIAN%2F30-interface;h=72f04a00781407bce1e5fa7b17b9f18787082d8c;hb=11a2db1a576e78f58af7f1e7e4c83422635b630d;hp=c3fbeaabe9fcecd5d80c0c148399fb57f7b2d557;hpb=3bd65f0ca635f1349626c2393a4dd8a50df64f54;p=automated-distro-installer

diff --git a/fai/config/scripts/DEBIAN/30-interface b/fai/config/scripts/DEBIAN/30-interface
index c3fbeaa..72f04a0 100755
--- a/fai/config/scripts/DEBIAN/30-interface
+++ b/fai/config/scripts/DEBIAN/30-interface
@@ -1,25 +1,78 @@
 #! /bin/bash
 
+# modified from upstream fai example
 error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
 
-if ifclass DHCPC && [ $FAI_ACTION = "install" ]
-then
-    cat > $target/etc/network/interfaces <<-EOF
+newnicnames() {
+
+    # determine predictable network names only for stretch and above
+
+    [ $do_init_tasks -eq 0 ] && return
+
+    ver=$($ROOTCMD dpkg-query --showformat='${Version}' --show udev)
+    if dpkg --compare-versions $ver lt 220-7; then
+	return
+    fi
+
+    [ -z "$NIC1" ] && return
+
+    fields="ID_NET_NAME_FROM_DATABASE ID_NET_NAME_ONBOARD ID_NET_NAME_SLOT ID_NET_NAME_PATH"
+    for field in $fields; do
+	name=$(udevadm info /sys/class/net/$NIC1 | sed -rn "s/^E: $field=(.+)/\1/p")
+	if [[ $name ]]; then
+	    NIC1=$name
+	    break
+	fi
+    done
+    # This condition is only needed because the nfsroot I use
+    # is based on Jessie, which has an old udev which can't
+    # figure out the persistent interface name used in stretch.
+    if ifclass VM; then NIC1=ens3; return; fi
+    if [[ ! $name ]]; then
+	echo "$0: error: could not find systemd predictable network name. Using $NIC1."
+    fi
+}
+
+if [ -z "$NIC1" ]; then
+    echo "ERROR: \$NIC1 is not defined. Cannot configure /etc/network/interfaces properly."
+fi
+newnicnames
+CIDR=$(ip -o -f inet addr show $NIC1 | awk '{print $4}')
+if ifclass DHCPC && [ $FAI_ACTION = "install" -o $FAI_ACTION = "dirinstall" ]; then
+
+    if ifclass VM; then
+        # note, this condition would apply to the elif below too,
+        # but I don't specify a static ip in fai, so not bothering
+        cat > $target/etc/network/interfaces <<-EOF
 	# generated by FAI
 	auto lo $NIC1
 	iface lo inet loopback
 	iface $NIC1 inet dhcp
 EOF
-elif [ $FAI_ACTION = "install" ]
-then
-      [ -n "$IPADDR" ] && cat > $target/etc/network/interfaces <<-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 "$CIDR" ] && 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
+	  address $CIDR
 	  gateway $GATEWAYS
 EOF
     [ -n "$NETWORK" ] && echo "localnet $NETWORK" > $target/etc/networks