From e67076c31638c4ac3df1c813a65ed154153775b6 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Thu, 19 Mar 2020 16:35:30 -0400 Subject: [PATCH 1/2] fedora-coreos-base: use NetworkManager for networking in the initramfs Moving to NetworkManager in the initrd should help us solve some problems we've been having with Networking. For what we want to do in Fedora CoreOS doing this right requires the network to be torn down in the initrd and also possibly propagated forward. We effectively move *to* NetworkManager in the initrd (the default in Fedora 31+) by putting back in the nm-initrd-generator, which we were previously removing. Requires: https://github.com/coreos/ignition-dracut/pull/159 Fixes: https://github.com/coreos/fedora-coreos-tracker/issues/394 --- manifests/fedora-coreos-base.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/manifests/fedora-coreos-base.yaml b/manifests/fedora-coreos-base.yaml index b869833cbf..81b0f5b394 100644 --- a/manifests/fedora-coreos-base.yaml +++ b/manifests/fedora-coreos-base.yaml @@ -55,9 +55,6 @@ remove-from-packages: /usr/lib/systemd/system/systemd-networkd-wait-online.service] - [systemd-container, /usr/lib/systemd/network/.*] - [systemd-udev, /usr/lib/systemd/network/.*] - # We're still using the legacy dracut network module for now. Dracut keys off - # of this: https://github.com/dracutdevs/dracut/blob/1fcc70fe57eea0ea658aa2de5c0044683fe85cf1/modules.d/40network/module-setup.sh#L11 - - [NetworkManager, /usr/libexec/nm-initrd-generator] remove-files: @@ -116,10 +113,6 @@ packages: - NetworkManager hostname - iproute-tc - adcli - # We still need this for now, but may drop it once we have NM in the initrd - # https://github.com/coreos/fedora-coreos-tracker/issues/394 - # https://github.com/coreos/fedora-coreos-tracker/issues/429 - - dhcp-client ## Teaming https://github.com/coreos/fedora-coreos-config/pull/289 and http://bugzilla.redhat.com/1758162 - NetworkManager-team teamd # Static firewalling From 8cb6b8c4373ba73737c8c89844b40a113c320e1e Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Tue, 24 Mar 2020 17:47:44 -0400 Subject: [PATCH 2/2] overrides: fasttrack ignition-2.2.1-1.git2d3ff58.fc31.x86_64 Needed for appropriately implementing NetworkManager support in the initramfs. See https://github.com/coreos/ignition-dracut/pull/159 --- manifest-lock.overrides.x86_64.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/manifest-lock.overrides.x86_64.yaml b/manifest-lock.overrides.x86_64.yaml index d0fa39d982..8fd6552777 100644 --- a/manifest-lock.overrides.x86_64.yaml +++ b/manifest-lock.overrides.x86_64.yaml @@ -22,3 +22,7 @@ packages: evra: 2020.1.21.ge9011530-2.fc31.x86_64 rpm-ostree-libs: evra: 2020.1.21.ge9011530-2.fc31.x86_64 + # Fast track new Ignition with initramfs network takedown + # https://bodhi.fedoraproject.org/updates/FEDORA-2020-6db5551bf6 + ignition: + evra: 2.2.1-1.git2d3ff58.fc31.x86_64