From: Fabian Pflug <f.pflug@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Fabian Pflug <f.pflug@pengutronix.de>
Subject: [ptxdist] [PATCH] networkmanager: allow not installing system-connections
Date: Thu, 14 Aug 2025 12:37:51 +0200 [thread overview]
Message-ID: <20250814103751.1994181-1-f.pflug@pengutronix.de> (raw)
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 <f.pflug@pengutronix.de>
---
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
reply other threads:[~2025-08-14 10:38 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250814103751.1994181-1-f.pflug@pengutronix.de \
--to=f.pflug@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox