* [PATCH·s6-linux-init] Remove error message when rc.shutdown.final script is not found
@ 2024-06-09 12:01 Sertonix
2024-06-16 9:51 ` Laurent Bercot
0 siblings, 1 reply; 2+ messages in thread
From: Sertonix @ 2024-06-09 12:01 UTC (permalink / raw)
To: supervision
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH·s6-linux-init] Remove error message when rc.shutdown.final script is not found
2024-06-09 12:01 [PATCH·s6-linux-init] Remove error message when rc.shutdown.final script is not found Sertonix
@ 2024-06-16 9:51 ` Laurent Bercot
0 siblings, 0 replies; 2+ messages in thread
From: Laurent Bercot @ 2024-06-16 9:51 UTC (permalink / raw)
To: supervision
>- EXECLINE_EXTBINPREFIX "foreground { ") < 0
>+ EXECLINE_EXTBINPREFIX "foreground { tryexec {") < 0
Good idea. Applied, thanks!
--
Laurent
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-06-16 9:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-06-09 12:01 [PATCH·s6-linux-init] Remove error message when rc.shutdown.final script is not found Sertonix
2024-06-16 9:51 ` Laurent Bercot
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).