From ca8d2c96ea09cb33ff6fef33c0314c24fc6a026a Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Wed, 9 Dec 2020 18:19:21 +0000 Subject: Make it work with the new s6. Add s6-linux-init-nuke. --- src/shutdown/s6-linux-init-shutdownd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/shutdown/s6-linux-init-shutdownd.c') diff --git a/src/shutdown/s6-linux-init-shutdownd.c b/src/shutdown/s6-linux-init-shutdownd.c index b646b5c..edf5adb 100644 --- a/src/shutdown/s6-linux-init-shutdownd.c +++ b/src/shutdown/s6-linux-init-shutdownd.c @@ -178,11 +178,11 @@ static inline void prepare_stage4 (char const *basedir, char what) if (buffer_puts(&b, "#!" EXECLINE_SHEBANGPREFIX "execlineb -P\n\n" EXECLINE_EXTBINPREFIX "foreground { " - S6_EXTBINPREFIX "s6-svc -Ox -- . }\n" + S6_EXTBINPREFIX "s6-svc -x -- . }\n" EXECLINE_EXTBINPREFIX "background\n{\n ") < 0 || (!nologger && buffer_puts(&b, EXECLINE_EXTBINPREFIX "foreground { " - S6_EXTBINPREFIX "s6-svc -Xh -- " SCANPREFIX LOGGER_SERVICEDIR " }\n ") < 0) + S6_EXTBINPREFIX "s6-svc -xc -- " SCANPREFIX LOGGER_SERVICEDIR " }\n ") < 0) || buffer_puts(&b, S6_EXTBINPREFIX "s6-svscanctl -b -- " SCANDIRFULL "\n}\n") < 0) strerr_diefu2sys(111, "write to ", STAGE4_FILE ".new") ; -- cgit v1.3.1