flatcar-network: Use upstream network and resolved Dracut modules

dracut/50flatcar-network/afterburn-network-kargs.service

@@ -2,25 +2,18 @@
 Description=Afterburn Initrd Setup Network Kernel Arguments
 Documentation=https://coreos.github.io/afterburn/usage/initrd-network-cmdline/
 
-# This service may produce additional kargs fragments,
-# which are then consumed by dracut-cmdline(8).
 DefaultDependencies=no
-Before=parse-ip-for-networkd.service systemd-networkd.service
-PartOf=systemd-networkd.service
+Before=dracut-cmdline.service
 # For extra safety
 ConditionKernelCommandLine=|coreos.oem.id=vmware
 ConditionKernelCommandLine=|flatcar.oem.id=vmware
+ConditionKernelCommandLine=|coreos.oem.id=proxmoxve
+ConditionKernelCommandLine=|flatcar.oem.id=proxmoxve
+
 OnFailure=emergency.target
 OnFailureJobMode=replace-irreversibly
 
-# Flatcar: Load coreos-metadata binary
-Requires=sysusr-usr.mount
-After=sysusr-usr.mount
-
 [Service]
 ExecStart=/usr/bin/coreos-metadata exp rd-network-kargs --cmdline --default-value ''
 Type=oneshot
 RemainAfterExit=yes
-
-[Install]
-WantedBy=systemd-networkd.service

dracut/50flatcar-network/module-setup.sh

@@ -5,62 +5,50 @@
 
 # called by dracut
 depends() {
-    echo net-lib systemd-networkd
+    echo net-lib systemd-networkd systemd-resolved
 }
 
 # called by dracut
 install() {
-    inst_multiple -o \
-        $systemdutildir/systemd-resolved \
-        $systemdsystemunitdir/systemd-resolved.service \
-        /etc/systemd/resolved.conf
-
     inst_multiple \
-        "$systemdnetwork"/{20-calico-tunl0,50-veth,98-{gce-coreos-virtio,gce-virtio,virtio}}.link
-
-    inst_simple "$moddir/network-cleanup.service" \
-        "$systemdsystemunitdir/network-cleanup.service"
-
-    inst_simple "$moddir/parse-ip-for-networkd.service" \
-        "$systemdsystemunitdir/parse-ip-for-networkd.service"
-
-    inst_simple "$moddir/afterburn-network-kargs.service" \
-        "$systemdsystemunitdir/afterburn-network-kargs.service"
+        "$systemdnetwork"/98-{gce-coreos-virtio,gce-virtio,virtio}.link \
+        "$systemdnetwork"/yy-{azure-sriov{,-coreos},pxe}.network \
+        "$systemdnetwork"/zz-default.network
 
-    inst_simple "$moddir/10-nodeps.conf" \
-        "$systemdsystemunitdir/systemd-resolved.service.d/10-nodeps.conf"
-
-    inst_simple "$moddir/yy-azure-sriov.network" \
-        "$systemdnetwork/yy-azure-sriov.network"
+    # Don't keep the configuration, otherwise the IP address is not released.
+    # This can cause problems when a different DHCP client configuration is set
+    # on first boot. The DHCP server would not recognize the rootfs system and
+    # would therefore keep two addresses allocated.
+    sed -i -r 's:^(KeepConfiguration)=.*:\1=no:' \
+        "$initdir/$systemdnetwork"/{yy-pxe,zz-default}.network
 
     inst_simple "$moddir/yy-digitalocean.network" \
         "$systemdnetwork/yy-digitalocean.network"
 
+    inst_simple "$moddir/yy-digitalocean-coreos.network" \
+        "$systemdnetwork/yy-digitalocean-coreos.network"
+
     inst_simple "$moddir/yy-netroot.network" \
         "$systemdnetwork/yy-netroot.network"
 
-    inst_simple "$moddir/yy-pxe.network" \
-        "$systemdnetwork/yy-pxe.network"
-
-    inst_simple "$moddir/zz-default.network" \
-        "$systemdnetwork/zz-default.network"
+    inst_simple "$moddir/network-cleanup.service" \
+        "$systemdsystemunitdir/network-cleanup.service"
 
-    # add a hook to generate networkd configuration from ip= arguments
-    inst_hook cmdline 99 "$moddir/parse-ip-for-networkd.sh"
+    inst_simple "$moddir/afterburn-network-kargs.service" \
+        "$systemdsystemunitdir/afterburn-network-kargs.service"
 
-    # user/group required for systemd-resolved
-    getent passwd systemd-resolve >> "$initdir/etc/passwd"
-    getent group systemd-resolve >> "$initdir/etc/group"
+    # Feed afterburn-injected kargs (in Dracut's cmdline.d) to
+    # systemd-network-generator, which only reads /proc/cmdline.
+    inst_simple "$moddir/systemd-network-generator-afterburn.conf" \
+        "$systemdsystemunitdir/systemd-network-generator.service.d/10-afterburn.conf"
 
-    # point /etc/resolv.conf @ systemd-resolved's resolv.conf
-    ln -s ../run/systemd/resolve/resolv.conf "$initdir/etc/resolv.conf"
+    # The systemd-networkd and systemd-resolved Dracut modules enable their
+    # services by default, but we only want them when pulled in on demand.
+    systemctl --root "$initdir" disable systemd-networkd.{service,socket} systemd-resolved.service
 
-    # the systemd-networkd dracut module enables networkd by default, but
-    # we only want it when pulled in
-    systemctl --root "$initdir" disable systemd-networkd.service
-    systemctl --root "$initdir" disable systemd-networkd.socket
+    # Disabling systemd-networkd also disables its generator because the former
+    # lists the latter in its [Install] Also=, so explicitly re-enable it.
+    systemctl --root "$initdir" enable systemd-network-generator.service
 
     systemctl --root "$initdir" enable network-cleanup.service
-    systemctl --root "$initdir" enable parse-ip-for-networkd.service
-    systemctl --root "$initdir" enable afterburn-network-kargs.service
 }

dracut/50flatcar-network/systemd-network-generator-afterburn.conf

@@ -0,0 +1,9 @@
+[Unit]
+# Augment command line with Afterburn before running systemd-network-generator.
+Wants=afterburn-network-kargs.service
+After=afterburn-network-kargs.service
+
+[Service]
+# systemd-network-generator only parses /proc/cmdline or SYSTEMD_PROC_CMDLINE.
+# Afterburn writes SYSTEMD_PROC_CMDLINE here; ignore it when absent.
+EnvironmentFile=-/run/afterburn/network-generator.env

dracut/50flatcar-network/yy-netroot.network

@@ -1,4 +1,7 @@
 [Match]
+# Only virtual NICs have a Kind, and we want to exclude those.
+Kind=!?*
+Type=!loopback
 KernelCommandLine=netroot
 
 [Network]

dracut/53ignition/flatcar-afterburn-network.service

@@ -4,9 +4,6 @@ DefaultDependencies=false
 Before=initrd.target
 After=systemd-networkd.service initrd-root-fs.target
 Wants=systemd-networkd.service initrd-root-fs.target
-# Flatcar: Load coreos-metadata binary
-Requires=sysusr-usr.mount
-After=sysusr-usr.mount
 
 [Service]
 Type=oneshot

dracut/53ignition/flatcar-metadata-hostname.service

@@ -4,9 +4,6 @@ DefaultDependencies=false
 Before=initrd.target
 After=systemd-networkd.service initrd-root-fs.target
 Wants=systemd-networkd.service initrd-root-fs.target
-# Flatcar: Load coreos-metadata binary
-Requires=sysusr-usr.mount
-After=sysusr-usr.mount
 
 # Ensure Ignition can overwrite /etc/hostname
 Before=ignition-files.service

dracut/53ignition/flatcar-openstack-hostname.service

@@ -4,9 +4,6 @@ DefaultDependencies=false
 Before=initrd.target
 After=systemd-networkd.service initrd-root-fs.target
 Wants=systemd-networkd.service initrd-root-fs.target
-# Flatcar: Load coreos-metadata binary
-Requires=sysusr-usr.mount
-After=sysusr-usr.mount
 
 # Ensure Ignition can overwrite /etc/hostname
 Before=ignition-files.service