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. --- NEWS | 3 +- doc/index.html | 3 +- doc/s6-linux-init-nuke.html | 51 ++++++++++++++++++++++++++++++++++ doc/upgrade.html | 3 +- package/deps.mak | 3 ++ package/info | 2 +- package/modes | 1 + package/targets.mak | 1 + src/init/s6-linux-init-maker.c | 7 +++-- src/lib/s6_linux_init_logouthook.c | 2 +- src/misc/deps-exe/s6-linux-init-nuke | 0 src/misc/s6-linux-init-nuke.c | 8 ++++++ src/shutdown/s6-linux-init-shutdownd.c | 4 +-- 13 files changed, 79 insertions(+), 9 deletions(-) create mode 100644 doc/s6-linux-init-nuke.html create mode 100644 src/misc/deps-exe/s6-linux-init-nuke create mode 100644 src/misc/s6-linux-init-nuke.c diff --git a/NEWS b/NEWS index c919a37..486cfe2 100644 --- a/NEWS +++ b/NEWS @@ -1,9 +1,10 @@ Changelog for s6-linux-init. -In 1.0.5.2 +In 1.0.6.0 ---------- - Bugfixes. + - New internal binary: s6-linux-init-nuke, to remove dependency on kill In 1.0.5.1 diff --git a/doc/index.html b/doc/index.html index 81e7749..0f62a6b 100644 --- a/doc/index.html +++ b/doc/index.html @@ -115,7 +115,7 @@ all the other packages against the static version of libskarnet. diff --git a/doc/s6-linux-init-nuke.html b/doc/s6-linux-init-nuke.html new file mode 100644 index 0000000..4cd3c0d --- /dev/null +++ b/doc/s6-linux-init-nuke.html @@ -0,0 +1,51 @@ + + + + + + s6-linux-init: the s6-linux-init-nuke program + + + + + + +

+s6-linux-init
+Software
+skarnet.org +

+ +

The s6-linux-init-nuke program

+ +

+ s6-linux-init-nuke kills alls processes immediately. +

+ +

Interface

+ +
+     s6-linux-init-nuke
+
+ +

+ s6-linux-init-nuke sends a SIGKILL to every process on the system. +(Process 1 will be unaffected.) +

+ +

+ Do not try this at home. +

+ +

Notes

+ + + + + diff --git a/doc/upgrade.html b/doc/upgrade.html index afa96fb..6ae4bd8 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -18,7 +18,7 @@

What has changed in s6-linux-init

-

in 1.0.5.2

+

in 1.0.6.0

in 1.0.5.1

diff --git a/package/deps.mak b/package/deps.mak index e5408fa..4c0aa04 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -10,6 +10,7 @@ src/init/s6-linux-init.o src/init/s6-linux-init.lo: src/init/s6-linux-init.c src src/lib/s6_linux_init_logouthook.o src/lib/s6_linux_init_logouthook.lo: src/lib/s6_linux_init_logouthook.c src/include-local/initctl.h src/include/s6-linux-init/s6-linux-init.h src/misc/s6-linux-init-echo.o src/misc/s6-linux-init-echo.lo: src/misc/s6-linux-init-echo.c src/misc/s6-linux-init-logouthookd.o src/misc/s6-linux-init-logouthookd.lo: src/misc/s6-linux-init-logouthookd.c +src/misc/s6-linux-init-nuke.o src/misc/s6-linux-init-nuke.lo: src/misc/s6-linux-init-nuke.c src/misc/s6-linux-init-umountall.o src/misc/s6-linux-init-umountall.lo: src/misc/s6-linux-init-umountall.c src/include/s6-linux-init/config.h src/shutdown/hpr_confirm_hostname.o src/shutdown/hpr_confirm_hostname.lo: src/shutdown/hpr_confirm_hostname.c src/shutdown/hpr.h src/shutdown/hpr_shutdown.o src/shutdown/hpr_shutdown.lo: src/shutdown/hpr_shutdown.c src/shutdown/hpr.h @@ -35,6 +36,8 @@ s6-linux-init-echo: EXTRA_LIBS := -lskarnet s6-linux-init-echo: src/misc/s6-linux-init-echo.o s6-linux-init-logouthookd: EXTRA_LIBS := -lskarnet ${SYSCLOCK_LIB} ${SOCKET_LIB} s6-linux-init-logouthookd: src/misc/s6-linux-init-logouthookd.o ${LIBUTMPS} +s6-linux-init-nuke: EXTRA_LIBS := +s6-linux-init-nuke: src/misc/s6-linux-init-nuke.o s6-linux-init-umountall: EXTRA_LIBS := -lskarnet s6-linux-init-umountall: src/misc/s6-linux-init-umountall.o ifeq ($(strip $(STATIC_LIBS_ARE_PIC)),) diff --git a/package/info b/package/info index 14c665a..9e1d6d1 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=s6-linux-init -version=1.0.5.2 +version=1.0.6.0 category=admin package_macro_name=S6_LINUX_INIT diff --git a/package/modes b/package/modes index f2c9b24..0cc7f74 100644 --- a/package/modes +++ b/package/modes @@ -5,5 +5,6 @@ s6-linux-init-shutdownd 0744 s6-linux-init-telinit 0744 s6-linux-init-logouthookd 0744 s6-linux-init-echo 0755 +s6-linux-init-nuke 0744 s6-linux-init-umountall 0744 s6-linux-init-maker 0744 diff --git a/package/targets.mak b/package/targets.mak index 412e9e3..04d940f 100644 --- a/package/targets.mak +++ b/package/targets.mak @@ -6,6 +6,7 @@ s6-linux-init-shutdownd \ s6-linux-init-telinit \ s6-linux-init-logouthookd \ s6-linux-init-echo \ +s6-linux-init-nuke \ s6-linux-init-umountall \ s6-linux-init-maker diff --git a/src/init/s6-linux-init-maker.c b/src/init/s6-linux-init-maker.c index 1e6de62..7c315a6 100644 --- a/src/init/s6-linux-init-maker.c +++ b/src/init/s6-linux-init-maker.c @@ -120,7 +120,8 @@ static int container_crash_script (buffer *b, char const *data) EXECLINE_EXTBINPREFIX "foreground\n{\n " EXECLINE_EXTBINPREFIX "fdmove -c 1 2\n " S6_LINUX_INIT_EXTBINPREFIX "s6-linux-init-echo -- \"s6-svscan crashed. Killing everything and exiting.\"\n}\n" - EXECLINE_EXTBINPREFIX "foreground { kill -9 -1 }\n" + EXECLINE_EXTBINPREFIX "foreground { " + S6_LINUX_INIT_EXTBINPREFIX "s6-linux-init-nuke }\n" EXECLINE_EXTBINPREFIX "wait { }\n" S6_LINUX_INIT_EXTBINPREFIX "s6-linux-init-hpr -fnp\n") >= 0 ; } @@ -134,6 +135,9 @@ static int container_exit_script (buffer *b, char const *data) EXECLINE_EXTBINPREFIX "multisubstitute\n{\n" " importas -uD0 -- EXITCODE exitcode\n " " importas -uDh -- HALTCODE haltcode\n}\n" + EXECLINE_EXTBINPREFIX "fdclose 1\n" + EXECLINE_EXTBINPREFIX "fdclose 2\n" + EXECLINE_EXTBINPREFIX "wait { }\n" EXECLINE_EXTBINPREFIX "ifelse -X { test $HALTCODE = r } { " S6_LINUX_INIT_EXTBINPREFIX "s6-linux-init-hpr -fnr }\n" EXECLINE_EXTBINPREFIX "ifelse -X { test $HALTCODE = p } { " @@ -547,7 +551,6 @@ static inline void make_image (char const *base) auto_dir(base, "run-image/" SCANDIR, 0, 0, 0755) ; auto_dir(base, "run-image/" SCANDIR "/.s6-svscan", 0, 0, 0755) ; auto_script(base, "run-image/" SCANDIR "/.s6-svscan/SIGTERM", &put_shebang_options, 0) ; - auto_script(base, "run-image/" SCANDIR "/.s6-svscan/SIGHUP", &put_shebang_options, 0) ; auto_script(base, "run-image/" SCANDIR "/.s6-svscan/SIGQUIT", &put_shebang_options, 0) ; auto_script(base, "run-image/" SCANDIR "/.s6-svscan/SIGINT", &sig_script, "-r") ; auto_script(base, "run-image/" SCANDIR "/.s6-svscan/SIGUSR1", &sig_script, "-p") ; diff --git a/src/lib/s6_linux_init_logouthook.c b/src/lib/s6_linux_init_logouthook.c index 810f29b..cc6b11a 100644 --- a/src/lib/s6_linux_init_logouthook.c +++ b/src/lib/s6_linux_init_logouthook.c @@ -1,7 +1,7 @@ /* ISC license. */ #include -#include +#include #include #include "initctl.h" diff --git a/src/misc/deps-exe/s6-linux-init-nuke b/src/misc/deps-exe/s6-linux-init-nuke new file mode 100644 index 0000000..e69de29 diff --git a/src/misc/s6-linux-init-nuke.c b/src/misc/s6-linux-init-nuke.c new file mode 100644 index 0000000..93326e5 --- /dev/null +++ b/src/misc/s6-linux-init-nuke.c @@ -0,0 +1,8 @@ +/* ISC license. */ + +#include + +int main (void) +{ + return kill(-1, SIGKILL) < 0 ; +} 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