Skip to content

Commit

Permalink
manifest: Exclude support for NM legacy ifcfg config format
Browse files Browse the repository at this point in the history
Since Fedora 36, the ifcfg-rh plugin implementing support for reading
network configuration files in the legacy ifcfg format has been split
out into its own RPM subpackage.

We can now remove our configuration workaround and instead ensure that
we do not ship this plugin at all.

See: coreos#1991
  • Loading branch information
travier authored and dustymabe committed Sep 30, 2022
1 parent 9d11bb7 commit f706a4f
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 20 deletions.
1 change: 0 additions & 1 deletion manifests/fedora-coreos-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ ostree-layers:
- overlay/05core
- overlay/08nouveau
- overlay/09misc
- overlay/14NetworkManager-plugins
- overlay/20platform-chrony

# Be minimal
Expand Down
6 changes: 3 additions & 3 deletions manifests/fedora-coreos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,6 @@ postprocess:
remove-from-packages:
# Drop NetworkManager support for ifcfg files, see also corresponding
# overlay.d/14NetworkManager-plugins
- [NetworkManager, /usr/lib64/NetworkManager/.*/libnm-settings-plugin-ifcfg-rh.so]
# Drop some buggy sysusers fragments which do not match static IDs allocation:
# https://bugzilla.redhat.com/show_bug.cgi?id=2105177
- [dbus-common, /usr/lib/sysusers.d/dbus.conf]
Expand Down Expand Up @@ -169,3 +166,6 @@ exclude-packages:
# For (datacenter/cloud oriented) servers, we want to see the details by default.
# https://lists.fedoraproject.org/archives/list/[email protected]/thread/HSMISZ3ETWQ4ETVLWZQJ55ARZT27AAV3/
- plymouth
# Do not use legacy ifcfg config format in NetworkManager
# See https://github.com/coreos/fedora-coreos-config/pull/1991
- NetworkManager-initscripts-ifcfg-rh
2 changes: 0 additions & 2 deletions overlay.d/14NetworkManager-plugins/statoverride

This file was deleted.

This file was deleted.

5 changes: 0 additions & 5 deletions overlay.d/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1700056

Warning about `/etc/sysconfig`.

14NetworkManager-plugins
------------------------

Disables the Red Hat Linux legacy `ifcfg` format.

15fcos
------

Expand Down

0 comments on commit f706a4f

Please sign in to comment.