From f706a4f66ad94e3424378423fd87245b5495d9bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Fri, 30 Sep 2022 11:14:39 +0200 Subject: [PATCH] manifest: Exclude support for NM legacy ifcfg config format 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: https://github.com/coreos/fedora-coreos-config/pull/1991 --- manifests/fedora-coreos-base.yaml | 1 - manifests/fedora-coreos.yaml | 6 +++--- overlay.d/14NetworkManager-plugins/statoverride | 2 -- .../conf.d/10-disable-default-plugins.conf | 9 --------- overlay.d/README.md | 5 ----- 5 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 overlay.d/14NetworkManager-plugins/statoverride delete mode 100644 overlay.d/14NetworkManager-plugins/usr/lib/NetworkManager/conf.d/10-disable-default-plugins.conf diff --git a/manifests/fedora-coreos-base.yaml b/manifests/fedora-coreos-base.yaml index ba39393294..5f428b1858 100644 --- a/manifests/fedora-coreos-base.yaml +++ b/manifests/fedora-coreos-base.yaml @@ -19,7 +19,6 @@ ostree-layers: - overlay/05core - overlay/08nouveau - overlay/09misc - - overlay/14NetworkManager-plugins - overlay/20platform-chrony # Be minimal diff --git a/manifests/fedora-coreos.yaml b/manifests/fedora-coreos.yaml index ed3eac3c47..bc2d203551 100644 --- a/manifests/fedora-coreos.yaml +++ b/manifests/fedora-coreos.yaml @@ -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] @@ -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/devel@lists.fedoraproject.org/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 diff --git a/overlay.d/14NetworkManager-plugins/statoverride b/overlay.d/14NetworkManager-plugins/statoverride deleted file mode 100644 index 27a95affe2..0000000000 --- a/overlay.d/14NetworkManager-plugins/statoverride +++ /dev/null @@ -1,2 +0,0 @@ -# Config file for overriding permission bits on overlay files/dirs -# Format: = diff --git a/overlay.d/14NetworkManager-plugins/usr/lib/NetworkManager/conf.d/10-disable-default-plugins.conf b/overlay.d/14NetworkManager-plugins/usr/lib/NetworkManager/conf.d/10-disable-default-plugins.conf deleted file mode 100644 index cabc5bb7f1..0000000000 --- a/overlay.d/14NetworkManager-plugins/usr/lib/NetworkManager/conf.d/10-disable-default-plugins.conf +++ /dev/null @@ -1,9 +0,0 @@ -# Stop NetworkManager from trying to load the ifcfg-rh plugin by default, -# which we don't ship. This actually disables all default plugins, of which -# ifcfg-rh is currently the only one. -# -# Note that we must do this for now because `-=` syntax doesn't work -# with compiled-in defaults. Proposed upstream fix: -# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/491 -[main] -plugins= diff --git a/overlay.d/README.md b/overlay.d/README.md index f57d9e9e57..ece8485284 100644 --- a/overlay.d/README.md +++ b/overlay.d/README.md @@ -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 ------