From dfa16e4a89158f3d3198db71e2eba3bda9330078 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sat, 10 Sep 2016 13:29:56 +0000 Subject: Make s6-linux-init a real init package. This means: - removing leaky options to s6-linux-init-maker. Default initial_path is now always /usr/bin:/bin; the uid and gid of the catch-all logger (used at boot time) can now be given numerically instead of relying on the (run-time) user db mapping. - moving s6-halt, s6-poweroff and s6-reboot over here, from s6-linux-utils - clarifying on the documentation a bit. --- package/deps.mak | 10 ++++++++++ package/modes | 3 +++ package/targets.mak | 5 ++++- 3 files changed, 17 insertions(+), 1 deletion(-) (limited to 'package') diff --git a/package/deps.mak b/package/deps.mak index f1fb7db..95fbd4b 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -2,7 +2,17 @@ # This file has been generated by tools/gen-deps.sh # +src/init/hpr.o src/init/hpr.lo: src/init/hpr.c +src/init/s6-halt.o src/init/s6-halt.lo: src/init/s6-halt.c src/init/s6-linux-init-maker.o src/init/s6-linux-init-maker.lo: src/init/s6-linux-init-maker.c +src/init/s6-poweroff.o src/init/s6-poweroff.lo: src/init/s6-poweroff.c +src/init/s6-reboot.o src/init/s6-reboot.lo: src/init/s6-reboot.c +s6-halt: EXTRA_LIBS := +s6-halt: src/init/s6-halt.o -lskarnet s6-linux-init-maker: EXTRA_LIBS := s6-linux-init-maker: src/init/s6-linux-init-maker.o -lskarnet +s6-poweroff: EXTRA_LIBS := +s6-poweroff: src/init/s6-poweroff.o -lskarnet +s6-reboot: EXTRA_LIBS := +s6-reboot: src/init/s6-reboot.o -lskarnet diff --git a/package/modes b/package/modes index 4b115b4..f2fafad 100644 --- a/package/modes +++ b/package/modes @@ -1 +1,4 @@ s6-linux-init-maker 0700 +s6-halt 0700 +s6-poweroff 0700 +s6-reboot 0700 diff --git a/package/targets.mak b/package/targets.mak index 2330c89..83ed8c5 100644 --- a/package/targets.mak +++ b/package/targets.mak @@ -1,6 +1,9 @@ BIN_TARGETS := SBIN_TARGETS := \ -s6-linux-init-maker +s6-linux-init-maker \ +s6-halt \ +s6-poweroff \ +s6-reboot LIBEXEC_TARGETS := -- cgit v1.3.1