From: "Sertonix" <sertonix@posteo.net>
To: <supervision@list.skarnet.org>
Subject: [PATCH·s6-linux-init] Remove error message when rc.shutdown.final script is not found
Date: Sun, 09 Jun 2024 12:01:56 +0000 [thread overview]
Message-ID: <D1VGYLU7YGYA.2D2AJ3BGKM2KF@posteo.net> (raw)
Signed-off-by: Sertonix <sertonix@posteo.net>
---
src/shutdown/s6-linux-init-shutdownd.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/shutdown/s6-linux-init-shutdownd.c b/src/shutdown/s6-linux-init-shutdownd.c
index 5a17625..dc0503e 100644
--- a/src/shutdown/s6-linux-init-shutdownd.c
+++ b/src/shutdown/s6-linux-init-shutdownd.c
@@ -191,10 +191,10 @@ static inline void prepare_stage4 (char const *basedir, char what)
EXECLINE_SHEBANGPREFIX "execlineb -P\n\n"
EXECLINE_EXTBINPREFIX "foreground { "
S6_LINUX_INIT_BINPREFIX "s6-linux-init-umountall }\n"
- EXECLINE_EXTBINPREFIX "foreground { ") < 0
+ EXECLINE_EXTBINPREFIX "foreground { tryexec {") < 0
|| !string_quote(&satmp, basedir, strlen(basedir))
|| buffer_put(&b, satmp.s + sabase, satmp.len - sabase) < 0
- || buffer_puts(&b, "/scripts/" STAGE4 " }\n"
+ || buffer_puts(&b, "/scripts/" STAGE4 " } }\n"
S6_LINUX_INIT_BINPREFIX "s6-linux-init-hpr -f -") < 0
|| buffer_put(&b, &what, 1) < 0
|| buffer_putsflush(&b, "\n") < 0)
--
2.45.2
next reply other threads:[~2024-06-09 12:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-09 12:01 Sertonix [this message]
2024-06-16 9:51 ` Laurent Bercot
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=D1VGYLU7YGYA.2D2AJ3BGKM2KF@posteo.net \
--to=sertonix@posteo.net \
--cc=supervision@list.skarnet.org \
/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;
as well as URLs for NNTP newsgroup(s).