From mboxrd@z Thu Jan  1 00:00:00 1970
Delivery-date: Sun, 24 Sep 2023 07:46:25 +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.94.2)
	(envelope-from <ptxdist-bounces+lore=lore.pengutronix.de@pengutronix.de>)
	id 1qkHwo-008zw1-9p
	for lore@lore.pengutronix.de; Sun, 24 Sep 2023 07:46:25 +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 1qkHwm-0000py-Ft; Sun, 24 Sep 2023 07:46:24 +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 1qkHv1-0006nX-NE; Sun, 24 Sep 2023 07:44:35 +0200
Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de)
 by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls
 TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1qkHv1-008ZEi-9m; Sun, 24 Sep 2023 07:44:35 +0200
Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96)
 (envelope-from <mol@pengutronix.de>) id 1qkHv1-000Vj1-0p;
 Sun, 24 Sep 2023 07:44:35 +0200
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Date: Sun, 24 Sep 2023 07:44:35 +0200
Message-Id: <20230924054435.121944-1-m.olbrich@pengutronix.de>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20230917192604.751338-1-rhi@pengutronix.de>
References: <20230917192604.751338-1-rhi@pengutronix.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: Re: [ptxdist] [APPLIED] networkmanager: fix /usr merge leftover
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: Roland Hieber <rhi@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 c1b63f970d179ae5969f2486ea4cf42df2c02156.

Michael

[sent from post-receive hook]

On Sun, 24 Sep 2023 07:44:35 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Fixes: d27127994b1cb7e52917 (2017-01-11, "networkmanager: /usr merge")
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20230917192604.751338-1-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/projectroot/etc/init.d/NetworkManager b/projectroot/etc/init.d/NetworkManager
> index f76e011317c4..67256feae373 100644
> --- a/projectroot/etc/init.d/NetworkManager
> +++ b/projectroot/etc/init.d/NetworkManager
> @@ -43,7 +43,7 @@ test -f /etc/default/NetworkManager && . /etc/default/NetworkManager
>  #	Function that starts the daemon/service.
>  #
>  d_start() {
> -	/lib/init/nm-unmanage.sh
> +	/usr/lib/init/nm-unmanage.sh
>  
>  	start-stop-daemon --start --quiet --pidfile $PIDFILE \
>  		--oknodo --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE