Thanks, applied as be01c0cf8d6dd3275b5427481224fdbb1e5a1b5e. Michael
[sent from post-receive hook] On Fri, 29 Aug 2025 11:46:23 +0200, Fabian Pflug <[email protected]> wrote: > 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 <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/networkmanager.in b/rules/networkmanager.in > index 6fbba97525af..cd75df1aa6e2 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 "create /etc/NetworkManagers/system-connections" > + > config NETWORKMANAGER_POLKIT > bool > depends on BROKEN > diff --git a/rules/networkmanager.make b/rules/networkmanager.make > index b9f4befc89c5..0585aead5d4c 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)
