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

diff --git a/fai/config/scripts/DEBIAN/30-interface b/fai/config/scripts/DEBIAN/30-interface
index 9883731..924b236 100755
--- a/fai/config/scripts/DEBIAN/30-interface
+++ b/fai/config/scripts/DEBIAN/30-interface
@@ -2,24 +2,50 @@
 
 error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
 
-if ifclass DHCPC && [ $FAI_ACTION = "install" -o $FAI_ACTION = "dirinstall" ]
-then
+
+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
+    if [[ ! $name ]]; then
+	echo "$0: error: could not find systemd predictable network name. Using $NIC1."
+    fi
+}
+
+newnicnames
+CIDR=$(ip -o -f inet addr show $NIC1 | awk '{print $4}')
+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
 EOF
-elif [ $FAI_ACTION = "install" -o $FAI_ACTION = "dirinstall" ]
-then
-      [ -n "$IPADDR" ] && cat > $target/etc/network/interfaces <<-EOF
+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