summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2019-04-18 21:19:46 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2019-04-18 21:19:46 +0000
commitcb5b1af6dee0ff41e73a3bc0661ba7aa7b1d1b94 (patch)
treecf98bbf28c070ffbf877fc487d1785498446a164 /package
parent73cff35173dd75b0254ae7cf9098c32822859de0 (diff)
downloads6-linux-init-cb5b1af6dee0ff41e73a3bc0661ba7aa7b1d1b94.tar.xz
Add support for nsss and utmps; add skel management
Diffstat (limited to 'package')
-rw-r--r--package/deps-build2
-rw-r--r--package/modes4
-rw-r--r--package/targets.mak11
3 files changed, 15 insertions, 2 deletions
diff --git a/package/deps-build b/package/deps-build
index d63229b..f622849 100644
--- a/package/deps-build
+++ b/package/deps-build
@@ -1,3 +1,5 @@
/package/prog/skalibs
+/package/admin/nsss $usensss
+/package/admin/utmps $utmps
/package/admin/execline
/package/admin/s6
diff --git a/package/modes b/package/modes
index eff9d76..a2cac61 100644
--- a/package/modes
+++ b/package/modes
@@ -5,7 +5,7 @@ s6-linux-init-reboot 0750
s6-linux-init-shutdown 0755
s6-linux-init-shutdownd 0700
s6-linux-init-telinit 0750
-s6-linux-init-logouthookd 0755
+s6-linux-init-logouthookd 0700
s6-linux-init-echo 0755
s6-linux-init-umountall 0750
-s6-linux-init-maker 0755
+s6-linux-init-maker 0700
diff --git a/package/targets.mak b/package/targets.mak
index b3c3151..ebe7d3c 100644
--- a/package/targets.mak
+++ b/package/targets.mak
@@ -14,3 +14,14 @@ BIN_TARGETS := \
s6-linux-init-maker
LIB_DEFS := S6_LINUX_INIT=s6_linux_init
+
+SKELFILES := $(wildcard skel/*)
+
+$(DESTDIR)$(skeldir)/%: skel/%
+ ./tools/install.sh -D -m 0755 $< $@
+
+install-skel: $(SKELFILES:skel/%=$(DESTDIR)$(skeldir)/%)
+
+.PHONY: install-skel
+
+install: install-skel