# 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
+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
+}
+
+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
- # installed by FAI
- auto lo $NIC1
- iface lo inet loopback
- iface $NIC1 inet dhcp
+ # generated by FAI
+ auto lo $NIC1
+ iface lo inet loopback
+ iface $NIC1 inet dhcp
EOF
else
cat > $target/etc/network/interfaces <<-EOF
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
- hwaddress ether $(cat /sys/class/net/$NIC1/address)
+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 $CIDR
+ gateway $GATEWAYS
EOF
[ -n "$NETWORK" ] && echo "localnet $NETWORK" > $target/etc/networks
if [ ! -L $target/etc/resolv.conf -a -e /etc/resolv.conf ]; then