6 changed files with 2 additions and 28 deletions
--- a/world/s6-scripts/Makefile
+++ b/world/s6-scripts/Makefile
@ -5,17 +5,10 @@ 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_scripts
+install: $(sysctl_libdir)/50-default.conf install_conf

 $(sysctl_libdir)/50-default.conf: data/50-default.conf | $(sysctl_libdir)
 	install -m644 $< $@
@ -23,11 +16,7 @@ $(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 install_scripts
+.PHONY: install_conf
--- a/world/s6-scripts/bin/halt
+++ b/world/s6-scripts/bin/halt
@ -1,3 +0,0 @@
-#!/bin/execlineb -S0
-
-s6-linux-init-hpr -h $@
--- a/world/s6-scripts/bin/poweroff
+++ b/world/s6-scripts/bin/poweroff
@ -1,3 +0,0 @@
-#!/bin/execlineb -S0
-
-s6-linux-init-hpr -p $@
--- a/world/s6-scripts/bin/reboot
+++ b/world/s6-scripts/bin/reboot
@ -1,3 +0,0 @@
-#!/bin/execlineb -S0
-
-s6-linux-init-hpr -r $@
--- a/world/s6-scripts/bin/shutdown
+++ b/world/s6-scripts/bin/shutdown
@ -1,3 +0,0 @@
-#!/bin/execlineb -S0
-
-s6-linux-init-shutdown $@
--- a/world/s6-scripts/bin/telinit
+++ b/world/s6-scripts/bin/telinit
@ -1,3 +0,0 @@
-#!/bin/execlineb -S0
-
-s6-linux-init-telinit $@