Skip to content

Commit

Permalink
fedora-coreos-base: drop nm-initrd-generator
Browse files Browse the repository at this point in the history
In Fedora 31, NetworkManager includes an initrd module which replaces
the legacy dracut networking one. The key bit is here:

https://github.com/dracutdevs/dracut/blob/1fcc70fe57eea0ea658aa2de5c0044683fe85cf1/modules.d/40network/module-setup.sh#L11.

It was initially in f30 as well, but was reverted due to issues:
https://src.fedoraproject.org/rpms/NetworkManager/c/7d3054a9e366f1ebdd9d7854bf11a3069119d6da?branch=f30

(One thing that confused me at first: note that this isn't a systemd
generator, it's run via the dracut cmdline hook.)

The generator does seem to have feature parity wrt karg support:
https://github.com/NetworkManager/NetworkManager/blob/ba64c162dc471740a405f9d59e7a132f0e290078/src/initrd/nmi-cmdline-reader.c

Though I couldn't get it to work in my tests; `rd.neednet=1` does not
result in a populated `resolv.conf`, which would of course cause
Ignition to fail.

Anyway, given that we tie pretty strongly into initrd networking for
e.g. Ignition and the installer, I think I'd rather we stick with the
status quo for now, and do the transition separately from the FCOS f31
rebase.
  • Loading branch information
jlebon committed Oct 21, 2019
1 parent eab078c commit 20408ff
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions fedora-coreos-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ 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:
Expand Down

0 comments on commit 20408ff

Please sign in to comment.