From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 14 Aug 2025 12:38:06 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1umVLT-000Th0-13 for lore@lore.pengutronix.de; Thu, 14 Aug 2025 12:38:06 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1umVLS-0007ly-IM; Thu, 14 Aug 2025 12:38:06 +0200 Received: from dude06.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::5c]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1umVLF-0007lk-Vx; Thu, 14 Aug 2025 12:37:54 +0200 From: Fabian Pflug To: ptxdist@pengutronix.de Date: Thu, 14 Aug 2025 12:37:51 +0200 Message-Id: <20250814103751.1994181-1-f.pflug@pengutronix.de> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH] networkmanager: allow not installing system-connections X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Fabian Pflug Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false If system-connections are managed by another packagee, they confict. Allow for them to not be installed by NetworkManager, but keep the previous behaviour as default settings. Signed-off-by: Fabian Pflug --- rules/networkmanager.in | 5 +++++ rules/networkmanager.make | 2 ++ 2 files changed, 7 insertions(+) diff --git a/rules/networkmanager.in b/rules/networkmanager.in index 6fbba9752..4b2937a53 100644 --- a/rules/networkmanager.in +++ b/rules/networkmanager.in @@ -102,6 +102,11 @@ config NETWORKMANAGER_EXAMPLES bool prompt "install examples for Network Manager" +config NETWORKMANAGER_SYSTEM_CONNECTIONS + bool + default y + prompt "install /etc/NetworkManagers/system-connections" + config NETWORKMANAGER_POLKIT bool depends on BROKEN diff --git a/rules/networkmanager.make b/rules/networkmanager.make index b9f4befc8..0585aead5 100644 --- a/rules/networkmanager.make +++ b/rules/networkmanager.make @@ -132,7 +132,9 @@ $(STATEDIR)/networkmanager.targetinstall: @$(call install_alternative, networkmanager, 0, 0, 0644, /etc/NetworkManager/NetworkManager.conf) @$(call install_copy, networkmanager, 0, 0, 0755, /etc/NetworkManager/dispatcher.d/) +ifdef NETWORKMANAGER_SYSTEM_CONNECTIONS @$(call install_copy, networkmanager, 0, 0, 0755, /etc/NetworkManager/system-connections/) +endif # # unmanage NFS root devices @$(call install_alternative, networkmanager, 0, 0, 0755, /usr/lib/init/nm-unmanage.sh) -- 2.39.5