From mboxrd@z Thu Jan  1 00:00:00 1970
Delivery-date: Fri, 29 Aug 2025 11:47:46 +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 <ptxdist-bounces+lore=lore.pengutronix.de@pengutronix.de>)
	id 1urvhz-005m3D-1k
	for lore@lore.pengutronix.de;
	Fri, 29 Aug 2025 11:47:46 +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 <ptxdist-bounces@pengutronix.de>)
	id 1urvhy-0006wI-Gv; Fri, 29 Aug 2025 11:47:46 +0200
Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2])
 by metis.whiteo.stw.pengutronix.de with esmtps
 (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92)
 (envelope-from <mol@pengutronix.de>)
 id 1urvgd-0003y9-NT; Fri, 29 Aug 2025 11:46:23 +0200
Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54])
 by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls
 TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96)
 (envelope-from <mol@pengutronix.de>) id 1urvgd-002hsC-1k;
 Fri, 29 Aug 2025 11:46:23 +0200
Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.98.2)
 (envelope-from <mol@pengutronix.de>) id 1urvgd-0000000AzWW-241C;
 Fri, 29 Aug 2025 11:46:23 +0200
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Date: Fri, 29 Aug 2025 11:46:23 +0200
Message-ID: <20250829094623.2619769-1-m.olbrich@pengutronix.de>
X-Mailer: git-send-email 2.47.2
In-Reply-To: <20250814103751.1994181-1-f.pflug@pengutronix.de>
References: <20250814103751.1994181-1-f.pflug@pengutronix.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: Re: [ptxdist] [APPLIED] 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 <ptxdist.pengutronix.de>
List-Unsubscribe: <https://metis.pengutronix.de/mailman/options/ptxdist>,
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <https://metis.pengutronix.de/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <https://metis.pengutronix.de/mailman/listinfo/ptxdist>,
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Cc: Fabian Pflug <f.pflug@pengutronix.de>
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
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

Thanks, applied as be01c0cf8d6dd3275b5427481224fdbb1e5a1b5e.

Michael

[sent from post-receive hook]

On Fri, 29 Aug 2025 11:46:23 +0200, Fabian Pflug <f.pflug@pengutronix.de> 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 <f.pflug@pengutronix.de>
> Message-Id: <20250814103751.1994181-1-f.pflug@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> 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)