X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FDEBIAN%2F30-interface;h=f23d1eaf62a5d0e6ccd317fc8df9ed6290bd04a6;hb=d4f7a9349a08f60957ca544f3d68a9b97015f6b9;hp=5955f7b3b9bdf76efa4ec398f288bac79f398eb1;hpb=3d9cc96092cdc8aa05bc95cf83c07bb1af692013;p=automated-distro-installer diff --git a/fai/config/scripts/DEBIAN/30-interface b/fai/config/scripts/DEBIAN/30-interface index 5955f7b..f23d1ea 100755 --- a/fai/config/scripts/DEBIAN/30-interface +++ b/fai/config/scripts/DEBIAN/30-interface @@ -69,10 +69,6 @@ newnicnames() { 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 @@ -101,28 +97,55 @@ case "$FAI_ACTION" in # 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 +# generated by FAI +auto lo $NIC1 +iface lo inet loopback +iface $NIC1 inet dhcp +iface $NIC1 inet6 auto EOF + + elif ifclass LINODE; then + # NIC1 is wrong, probably because the installer distro + # is stretch and the installed one is buster. + # todo: after upgrading installer to buster, + # try removing this condition + cat > $target/etc/network/interfaces < $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 + cat > $target/etc/network/interfaces <$target/etc/initramfs-tools/conf.d/mine <