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. --- package/deps.mak | 3 +++ package/info | 2 +- package/modes | 1 + package/targets.mak | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) (limited to 'package') 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 -- cgit v1.2.3