From 793e16b76c823c4ecd467a8af7b00b251ffddb53 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 20 Sep 2022 08:58:37 -0700 Subject: [PATCH] Install Fedora ifcfg NM compat package Starting with Fedora 36 the NetworkManager package no longer includes ifcfg support by default. You need an additional package "NetworkManager-initscripts-ifcfg-rh" to pull in the compatibility plugin. Glean's support for Fedora relies on this compatibility system so we install this package via the simple-init element package deps. Change-Id: I76ac39b8dedcb1c5bc4595aedc0a732c99c8721e --- .../elements/simple-init/package-installs.yaml | 2 ++ diskimage_builder/elements/simple-init/pkg-map | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/diskimage_builder/elements/simple-init/package-installs.yaml b/diskimage_builder/elements/simple-init/package-installs.yaml index ad868c0a..12340347 100644 --- a/diskimage_builder/elements/simple-init/package-installs.yaml +++ b/diskimage_builder/elements/simple-init/package-installs.yaml @@ -5,3 +5,5 @@ network-scripts: when: DIB_SIMPLE_INIT_NETWORKMANAGER = 0 NetworkManager: when: DIB_SIMPLE_INIT_NETWORKMANAGER != 0 +NetworkManager-initscripts-ifcfg-rh: + when: DIB_SIMPLE_INIT_NETWORKMANAGER != 0 diff --git a/diskimage_builder/elements/simple-init/pkg-map b/diskimage_builder/elements/simple-init/pkg-map index 72f2d8eb..5f7c5069 100644 --- a/diskimage_builder/elements/simple-init/pkg-map +++ b/diskimage_builder/elements/simple-init/pkg-map @@ -24,9 +24,20 @@ "network-scripts": "network-scripts" } }, + "release": { + "fedora": { + "36": { + "NetworkManager-initscripts-ifcfg-rh": "NetworkManager-initscripts-ifcfg-rh" + }, + "37": { + "NetworkManager-initscripts-ifcfg-rh": "NetworkManager-initscripts-ifcfg-rh" + } + } + }, "default": { "dhcp-client": "isc-dhcp-client", "ifupdown": "", - "network-scripts": "" + "network-scripts": "", + "NetworkManager-initscripts-ifcfg-rh": "" } }