From mboxrd@z Thu Jan  1 00:00:00 1970
Delivery-date: Thu, 07 Oct 2021 12:20:02 +0200
Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33])
	by lore.white.stw.pengutronix.de with esmtp (Exim 4.92)
	(envelope-from <ptxdist-bounces+lore=lore.pengutronix.de@pengutronix.de>)
	id 1mYQVO-0006VW-Hf
	for lore@lore.pengutronix.de; Thu, 07 Oct 2021 12:20:02 +0200
Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de)
	by metis.ext.pengutronix.de with esmtp (Exim 4.92)
	(envelope-from <ptxdist-bounces@pengutronix.de>)
	id 1mYQVO-0006cl-8A; Thu, 07 Oct 2021 12:20:02 +0200
Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2])
 by metis.ext.pengutronix.de with esmtps
 (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92)
 (envelope-from <mol@pengutronix.de>)
 id 1mYQTx-0004k0-8d; Thu, 07 Oct 2021 12:18:33 +0200
Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de)
 by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.92)
 (envelope-from <mol@pengutronix.de>)
 id 1mYQTw-0005yE-Nl; Thu, 07 Oct 2021 12:18:32 +0200
Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.92)
 (envelope-from <mol@pengutronix.de>)
 id 1mYQTw-00GTCj-N8; Thu, 07 Oct 2021 12:18:32 +0200
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Date: Thu,  7 Oct 2021 12:18:32 +0200
Message-Id: <20211007101832.3925466-1-m.olbrich@pengutronix.de>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20210827083353.22152-3-ada@thorsis.com>
References: <20210827083353.22152-3-ada@thorsis.com>
MIME-Version: 1.0
Subject: Re: [ptxdist] [APPLIED] rc-once: Adapt path in scripts including
 shell lib
X-BeenThere: ptxdist@pengutronix.de
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Cc: Alexander Dahl <ada@thorsis.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
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.ext.pengutronix.de); SAEximRunCond expanded to false

Thanks, applied as 65a6f73e1254c197829cee761df29f8465e562e3.

Michael

[sent from post-receive hook]

On Thu, 07 Oct 2021 12:18:32 +0200, Alexander Dahl <ada@thorsis.com> wrote:
> The usr/lib/init/rc-once.sh script was moved for /usr merge, but scripts
> using this piece were not updated.
> 
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Fixes: e74c5e613d9e ("rc-once: /usr merge")
> Message-Id: <20210827083353.22152-3-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/projectroot/etc/init.d/rc-once b/projectroot/etc/init.d/rc-once
> index 2387c315732a..bf8473149cc2 100644
> --- a/projectroot/etc/init.d/rc-once
> +++ b/projectroot/etc/init.d/rc-once
> @@ -3,7 +3,7 @@
>  PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
>  
>  . /lib/init/initmethod-bbinit-functions.sh
> -. /lib/init/rc-once.sh
> +. /usr/lib/init/rc-once.sh
>  
>  do_start() {
>  	test -e "$STAMP" && return
> diff --git a/projectroot/usr/lib/systemd/systemd-rc-once b/projectroot/usr/lib/systemd/systemd-rc-once
> index db3d84e3c342..3ab5d75c5a3d 100644
> --- a/projectroot/usr/lib/systemd/systemd-rc-once
> +++ b/projectroot/usr/lib/systemd/systemd-rc-once
> @@ -1,7 +1,7 @@
>  #!/bin/sh
>  
>  . /lib/init/initmethod-bbinit-functions.sh
> -. /lib/init/rc-once.sh
> +. /usr/lib/init/rc-once.sh
>  
>  start() {
>  	if ! mount_root_rw; then

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de