mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Alexander Dahl <ada@thorsis.com>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH 2/3] rc-once: Adapt path in scripts including shell lib
Date: Fri, 27 Aug 2021 10:33:52 +0200	[thread overview]
Message-ID: <20210827083353.22152-3-ada@thorsis.com> (raw)
In-Reply-To: <20210827083353.22152-1-ada@thorsis.com>

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")
---
 projectroot/etc/init.d/rc-once              | 2 +-
 projectroot/usr/lib/systemd/systemd-rc-once | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/projectroot/etc/init.d/rc-once b/projectroot/etc/init.d/rc-once
index 2387c3157..bf8473149 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 db3d84e3c..3ab5d75c5 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
-- 
2.30.2


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


  parent reply	other threads:[~2021-08-27  8:34 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 ` Alexander Dahl [this message]
2021-10-07 10:18   ` [ptxdist] [APPLIED] rc-once: Adapt path in scripts including shell lib Michael Olbrich
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=20210827083353.22152-3-ada@thorsis.com \
    --to=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