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]> --- 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
