From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Alexander Dahl <ada@thorsis.com>
Subject: Re: [ptxdist] [APPLIED] rc-once: Adapt path in scripts including shell lib
Date: Thu, 7 Oct 2021 12:18:32 +0200 [thread overview]
Message-ID: <20211007101832.3925466-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20210827083353.22152-3-ada@thorsis.com>
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
next prev parent reply other threads:[~2021-10-07 10:20 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-27 8:33 [ptxdist] [PATCH 0/3] rc-once: Minor script cleanup Alexander Dahl
2021-08-27 8:33 ` [ptxdist] [PATCH 1/3] dropbear: Remove not needed include from init script Alexander Dahl
2021-10-07 10:18 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-08-27 8:33 ` [ptxdist] [PATCH 2/3] rc-once: Adapt path in scripts including shell lib Alexander Dahl
2021-10-07 10:18 ` Michael Olbrich [this message]
2021-08-27 8:33 ` [ptxdist] [PATCH 3/3] rc-once: Fix include path Alexander Dahl
2021-10-07 10:18 ` [ptxdist] [APPLIED] " Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211007101832.3925466-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ada@thorsis.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox