Merge branch 'odin' of git.hitchhiker-linux.org:Hitchhiker/src into odin

world/s6-scripts/Makefile

@@ -5,10 +5,17 @@ progname           = init
 export exec_prefix = $(DESTDIR)
 export sbin        = 1
 include hhl.script.mk
+VPATH             += bin
+
+scripts           += halt
+scripts           += poweroff
+scripts           += reboot
+scripts           += shutdown
+scripts           += telinit
 
 sysctl_libdir      = $(DESTDIR)/usr/lib/sysctl.d
 
-install: $(sysctl_libdir)/50-default.conf install_conf
+install: $(sysctl_libdir)/50-default.conf install_conf install_scripts
 
 $(sysctl_libdir)/50-default.conf: data/50-default.conf | $(sysctl_libdir)
 	install -m644 $< $@
@@ -16,7 +23,11 @@ $(sysctl_libdir)/50-default.conf: data/50-default.conf | $(sysctl_libdir)
 install_conf:
 	cp -R etc $(DESTDIR)
 
+install_scripts: $(scripts)
+	for script in $(scripts) ; \
+		do install -m755 $$script $(DESTDIR)/bin
+
 $(sysctl_libdir):
 	install -d $@
 
-.PHONY: install_conf
+.PHONY: install_conf install_scripts

world/s6-scripts/bin/halt

@@ -0,0 +1,3 @@
+#!/bin/execlineb -S0
+
+s6-linux-init-hpr -h $@

world/s6-scripts/bin/poweroff

@@ -0,0 +1,3 @@
+#!/bin/execlineb -S0
+
+s6-linux-init-hpr -p $@

world/s6-scripts/bin/reboot

@@ -0,0 +1,3 @@
+#!/bin/execlineb -S0
+
+s6-linux-init-hpr -r $@

world/s6-scripts/bin/shutdown

@@ -0,0 +1,3 @@
+#!/bin/execlineb -S0
+
+s6-linux-init-shutdown $@

world/s6-scripts/bin/telinit

@@ -0,0 +1,3 @@
+#!/bin/execlineb -S0
+
+s6-linux-init-telinit $@