summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSertonix <sertonix@posteo.net>2024-06-09 12:01:56 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2024-06-16 09:49:57 +0000
commit15579efe0e4bbc60b2e420a191cdea655316a8af (patch)
tree4f65e1f1e15ca3bf541c4483c3ab4c606b347dbc
parent28787fc0512f8df17809c1a0507da2bfed552082 (diff)
downloads6-linux-init-15579efe0e4bbc60b2e420a191cdea655316a8af.tar.xz
Remove error message when rc.shutdown.final script is not found
Signed-off-by: Sertonix <sertonix@posteo.net>
-rw-r--r--src/shutdown/s6-linux-init-shutdownd.c4
1 files 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)