Reorganize s6-services

main/s6-services/APKBUILD

@@ -1,8 +1,8 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
 pkgname=s6-services
-pkgver=0.3
-pkgrel=6
+pkgver=0.5
+pkgrel=7
 pkgdesc="Base services for s6"
 url="none"
 arch="noarch"
@@ -14,23 +14,26 @@ builddir="$srcdir/"
 prepare() {
 	default_prepare
 	cp -R "$startdir"/rc "$builddir"/rc
+	cp -R "$startdir"/env "$builddir"/env
 }
 
 package() {
-	mkdir -p "$pkgdir"/etc
-	mv "$builddir"/rc "$pkgdir"/etc/s6-rc
+	mkdir -p "$pkgdir"/etc/s6
+	mv "$builddir"/rc "$pkgdir"/etc/s6/rc
+	mv "$builddir"/env "$pkgdir"/etc/s6/env
 }
 
 core() {
-	amove etc/s6-rc/core
+	amove etc/s6/rc/core
+	amove etc/s6/env/core
 }
 
 net() {
-	amove etc/s6-rc/net
+	amove etc/s6/rc/net
 }
 
 desktop() {
-	amove etc/s6-rc/desktop
+	amove etc/s6/rc/desktop
 }
 
 check() {

main/s6-services/env/core/logger/LOGPREFIX

@@ -0,0 +1 @@
+/var/log

main/s6-services/env/core/path/PATH

@@ -0,0 +1 @@
+/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin

main/s6-services/rc/core/clock.hw/up

@@ -1,4 +1,11 @@
 #!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
 emptyenv
-export PATH /bin:/sbin:/usr/bin:/usr/sbin
+
+export PATH $PATH
+
+fdclose 1
+fdclose 2
+
 exec hwclock -u --systz

main/s6-services/rc/core/getty.tty1/run

@@ -1,6 +1,13 @@
 #!/bin/execlineb -P
-s6-envdir env
-importas -D tty1 -u TTY TTY
-importas -D 38400 -u BAUD BAUD
-export PATH /bin:/sbin:/usr/bin:/usr/sbin
-exec getty $BAUD $TTY
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+emptyenv
+
+export PATH $PATH
+define BAUD 38400
+define TTY tty1
+
+fdclose 1
+fdclose 2
+
+exec getty ${BAUD} ${TTY}

main/s6-services/rc/core/hostname/up

@@ -1,3 +1,12 @@
 #!/bin/execlineb -P
-if -t { test -s /etc/hostname } backtick -n -E HOSTNAME { head -1 /etc/hostname }
-if -t { test -n $HOSTNAME } redirfd -w 1 /proc/sys/kernel/hostname echo $HOSTNAME
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+emptyenv
+
+define HOSTNAME localhost
+export PATH $PATH
+
+fdclose 1
+fdclose 2
+
+redirfd -w 1 /proc/sys/kernel/hostname echo $HOSTNAME

main/s6-services/rc/core/klogd/run

@@ -1,6 +1,11 @@
 #!/bin/execlineb -P
-fdmove -c 2 1
-redirfd -r 0 /proc/kmsg
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
 emptyenv
-export PATH /bin:/sbin:/usr/bin:/usr/sbin
-exec ucspilogd
+
+export PATH $PATH
+define READFROM /proc/kmsg
+
+fdmove -c 2 1
+
+foreground { redirfd -r 0 ${READFROM} } ucspilogd

main/s6-services/rc/core/kmod.sysfs/up

@@ -1,5 +1,17 @@
 #!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
 emptyenv
-redirfd -w 2 /dev/null
-export PATH /bin:/sbin:/usr/bin:/usr/sbin
-if -t { pipeline { pipeline { exec find /sys -name modalias -type f -print0 } exec xargs -0 exec sort -u } exec xargs exec modprobe -b -a -s }
+
+export PATH $PATH
+
+fdclose 1
+fdclose 2
+
+if -t {
+	pipeline {
+		pipeline {
+			exec find /sys -name modalias -type f -print0
+		} exec xargs -0 exec sort -u
+	} exec xargs exec modprobe -b -a -s
+}

main/s6-services/rc/core/logger.klogd/run

@@ -1,4 +1,13 @@
 #!/bin/execlineb -P
-s6-envdir env
-importas -D /var/log/klogd -u LOGDEST LOGDEST
-s6-log -d3 -- t s1000000 n20 $LOGDEST
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+s6-envdir /etc/s6/env/core/logger
+importas -i LOGPREFIX LOGPREFIX
+emptyenv
+
+export PATH $PATH
+define LOGGERNAME klogd
+define LOGSIZE 1000000
+define LOGARCHIVES 20
+
+s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}

main/s6-services/rc/core/logger.syslogd/run

@@ -1,4 +1,13 @@
 #!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+s6-envdir /etc/s6/env/core/logger
+importas -i LOGPREFIX LOGPREFIX
 emptyenv
-importas -D /var/log/syslogd -u LOGDEST LOGDEST
-s6-log -d3 -- t s1000000 n20 $LOGDEST
+
+export PATH $PATH
+define LOGGERNAME syslogd
+define LOGSIZE 1000000
+define LOGARCHIVES 20
+
+s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}

main/s6-services/rc/core/mount.dev/up

@@ -1,4 +1,15 @@
 #!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
 emptyenv
-export PATH /bin:/sbin:/usr/bin:/usr/sbin
-foreground { exec mount -t devtmpfs none /dev } if -nt { importas status ? test $status -eq 1 }
+
+export PATH $PATH
+
+fdclose 1
+fdclose 2
+
+foreground {
+	exec mount -t devtmpfs none /dev
+} if -nt {
+	importas status ? test $status -eq 1
+}

main/s6-services/rc/core/mount.proc/up

@@ -1,4 +1,15 @@
 #!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
 emptyenv
-export PATH /bin:/sbin:/usr/bin:/usr/sbin
-foreground { exec mount -t proc none /proc } if -nt { importas status ? test $status -eq 1 }
+
+export PATH $PATH
+
+fdclose 1
+fdclose 2
+
+foreground {
+	exec mount -t proc none /proc
+} if -nt {
+	importas status ? test $status -eq 1
+}

main/s6-services/rc/core/mount.run/up

@@ -1,4 +1,11 @@
 #!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
 emptyenv
-export PATH /bin:/sbin:/usr/bin:/usr/sbin
+
+export PATH $PATH
+
+fdclose 1
+fdclose 2
+
 exec mount -t tmpfs none /run

main/s6-services/rc/core/mount.rw/up

@@ -1,4 +1,12 @@
 #!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
 emptyenv
-export PATH /bin:/sbin:/usr/bin:/usr/sbin
-exec mount -t ext4 -o remount,rw /
+
+export PATH $PATH
+define ROOTFSTYPE ext4
+
+fdclose 1
+fdclose 2
+
+exec mount -t ${ROOTFSTYPE} -o remount,rw /

main/s6-services/rc/core/mount.sys/up

@@ -1,4 +1,15 @@
 #!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
 emptyenv
-export PATH /bin:/sbin:/usr/bin:/usr/sbin
-foreground { exec mount -t sysfs none /sys } if -nt { importas status ? test $status -eq 1 }
+
+export PATH $PATH
+
+fdclose 1
+fdclose 2
+
+foreground {
+	exec mount -t sysfs none /sys
+} if -nt {
+	importas status ? test $status -eq 1
+}

main/s6-services/rc/core/mount.tmp/up

@@ -1,4 +1,11 @@
 #!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
 emptyenv
-export PATH /bin:/sbin:/usr/bin:/usr/sbin
+
+export PATH $PATH
+
+fdclose 1
+fdclose 2
+
 exec mount -t tmpfs none /tmp

main/s6-services/rc/core/syslogd/run

@@ -1,4 +1,10 @@
 #!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
 emptyenv
-s6-envuidgid nobody
+
+export PATH $PATH
+define RUNAS nobody
+
+s6-envuidgid ${RUNAS}
 s6-socklog -d3 -U -t3000

main/s6-services/rc/desktop/bundle.graphical.0/type

@@ -0,0 +1 @@
+bundle

main/s6-services/rc/desktop/dwm.0/env/DISPLAY

@@ -1 +0,0 @@
-:0

main/s6-services/rc/desktop/dwm.0/run

@@ -1,7 +1,11 @@
 #!/bin/execlineb -P
-s6-envdir env
-importas -D 0 -u DISPLAY DISPLAY
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+emptyenv
+
+export PATH $PATH
+export DISPLAY :0
+
 fdmove -c 2 1
-export PATH /bin:/sbin:/usr/bin:/usr/sbin
-export DISPLAY $DISPLAY
+
 exec dwm

main/s6-services/rc/desktop/logger.dwm/run

@@ -1,4 +1,13 @@
 #!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+s6-envdir /etc/s6/env/core/logger
+importas -i LOGPREFIX LOGPREFIX
 emptyenv
-importas -D /var/log/dwm -u LOGDEST LOGDEST
-s6-log -d3 -- t s1000000 n20 $LOGDEST
+
+export PATH $PATH
+define LOGGERNAME dwm
+define LOGSIZE 1000000
+define LOGARCHIVES 20
+
+s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}

main/s6-services/rc/desktop/logger.udevd/run

@@ -1,4 +1,13 @@
 #!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+s6-envdir /etc/s6/env/core/logger
+importas -i LOGPREFIX LOGPREFIX
 emptyenv
-importas -D /var/log/udevd -u LOGDEST LOGDEST
-s6-log -d3 -- t s1000000 n20 $LOGDEST
+
+export PATH $PATH
+define LOGGERNAME udevd
+define LOGSIZE 1000000
+define LOGARCHIVES 20
+
+s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}

main/s6-services/rc/desktop/logger.xorg/run

@@ -1,4 +1,13 @@
 #!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+s6-envdir /etc/s6/env/core/logger
+importas -i LOGPREFIX LOGPREFIX
 emptyenv
-importas -D /var/log/xorg -u LOGDEST LOGDEST
-s6-log -d3 -- t s1000000 n20 $LOGDEST
+
+export PATH $PATH
+define LOGGERNAME xorg
+define LOGSIZE 1000000
+define LOGARCHIVES 20
+
+s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}

main/s6-services/rc/desktop/udevd.settle/up

@@ -1,4 +1,11 @@
 #!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
 emptyenv
-export PATH /bin:/sbin:/usr/bin:/usr/sbin
-foreground { redirfd -w 1 /dev/null udevadm settle }
+
+export PATH $PATH
+
+fdclose 1
+fdclose 2
+
+exec udevadm settle

main/s6-services/rc/desktop/udevd.trigger/up

@@ -1,5 +1,12 @@
 #!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
 emptyenv
-export PATH /bin:/sbin:/usr/bin:/usr/sbin
-foreground { redirfd -w 1 /dev/null udevadm trigger --action=add --type=subsystems }
-foreground { redirfd -w 1 /dev/null udevadm trigger --action=add --type=devices }
+
+export PATH $PATH
+
+fdclose 1
+fdclose 2
+
+foreground { udevadm trigger --action=add --type=subsystems }
+foreground { udevadm trigger --action=add --type=devices }

main/s6-services/rc/desktop/udevd/run

@@ -1,5 +1,10 @@
 #!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
 emptyenv
+
+export PATH $PATH
+
 fdmove -c 2 1
-export PATH /bin:/sbin:/usr/bin:/usr/sbin
+
 exec udevd

main/s6-services/rc/desktop/xorg.0/env/DISPLAY

@@ -1 +0,0 @@
-:0

main/s6-services/rc/desktop/xorg.0/env/TTYN

@@ -1 +0,0 @@
-2

main/s6-services/rc/desktop/xorg.0/run

@@ -1,7 +1,12 @@
 #!/bin/execlineb -P
-s6-envdir env
-importas -D 2 -u TTYN TTYN
-importas -D 0 -u DISPLAY DISPLAY
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+emptyenv
+
+export PATH $PATH
+define DISPLAY :0
+define VTN 2
+
 fdmove -c 2 1
-export PATH /bin:/sbin:/usr/bin:/usr/sbin
-exec Xorg $DISPLAY -displayfd 3 -noreset -nolisten tcp -verbose 10 vt$TTYN
+
+exec Xorg ${DISPLAY} -displayfd 3 -noreset -nolisten tcp -verbose 10 vt${VTN}

main/s6-services/rc/net/bundle.interface.eth0/type

@@ -0,0 +1 @@
+bundle

main/s6-services/rc/net/link.eth0/down

@@ -1,4 +1,6 @@
 #!/bin/execlineb -P
 emptyenv
+fdclose 1
+fdclose 2
 export PATH /bin:/sbin:/usr/bin:/usr/sbin
 exec ip link set dev eth0 down

main/s6-services/rc/net/link.eth0/up

@@ -1,4 +1,12 @@
 #!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
 emptyenv
-export PATH /bin:/sbin:/usr/bin:/usr/sbin
-exec ip link set dev eth0 up
+
+export PATH $PATH
+define INTERFACE eth0
+
+fdclose 1
+fdclose 2
+
+exec ip link set dev ${INTERFACE} up

main/s6-services/rc/net/logger.ntpd/consumer-for

@@ -1 +1 @@
-ntpd
+ntpd.1

main/s6-services/rc/net/logger.ntpd/run

@@ -1,4 +1,13 @@
 #!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+s6-envdir /etc/s6/env/core/logger
+importas -i LOGPREFIX LOGPREFIX
 emptyenv
-importas -D /var/log/ntpd -u LOGDEST LOGDEST
-s6-log -d3 -- t s1000000 n20 $LOGDEST
+
+export PATH $PATH
+define LOGGERNAME ntpd
+define LOGSIZE 1000000
+define LOGARCHIVES 20
+
+s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}

main/s6-services/rc/net/logger.sshd/consumer-for

@@ -0,0 +1 @@
+sshd.1

main/s6-services/rc/net/logger.sshd/notification-fd

@@ -0,0 +1 @@
+3

main/s6-services/rc/net/logger.sshd/run

@@ -0,0 +1,13 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+s6-envdir /etc/s6/env/core/logger
+importas -i LOGPREFIX LOGPREFIX
+emptyenv
+
+export PATH $PATH
+define LOGGERNAME sshd
+define LOGSIZE 1000000
+define LOGARCHIVES 20
+
+s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}

main/s6-services/rc/net/logger.udhcpc/run

@@ -1,4 +1,13 @@
 #!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+s6-envdir /etc/s6/env/core/logger
+importas -i LOGPREFIX LOGPREFIX
 emptyenv
-importas -D /var/log/udhcpc -u LOGDEST LOGDEST
-s6-log -d3 -- t s1000000 n20 $LOGDEST
+
+export PATH $PATH
+define LOGGERNAME udhcpc
+define LOGSIZE 1000000
+define LOGARCHIVES 20
+
+s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}

main/s6-services/rc/net/module.ipv6/down

@@ -1,4 +1,6 @@
 #!/bin/execlineb -P
 emptyenv
+fdclose 1
+fdclose 2
 export PATH /bin:/sbin:/usr/bin:/usr/sbin
 exec rmmod ipv6

main/s6-services/rc/net/module.ipv6/up

@@ -1,4 +1,12 @@
 #!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
 emptyenv
-export PATH /bin:/sbin:/usr/bin:/usr/sbin
-exec modprobe ipv6
+
+export PATH $PATH
+define MODULE ipv6
+
+fdclose 1
+fdclose 2
+
+exec modprobe ${MODULE}

main/s6-services/rc/net/ntpd.1/run

@@ -0,0 +1,11 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+emptyenv
+
+export PATH $PATH
+define NTPS pool.ntp.org
+
+fdmove -c 2 1
+
+exec ntpd -n -dd -p ${NTPS}

main/s6-services/rc/net/ntpd.1/type

@@ -0,0 +1 @@
+longrun

main/s6-services/rc/net/sshd.1/producer-for

@@ -0,0 +1 @@
+logger.sshd

main/s6-services/rc/net/sshd.1/run

@@ -0,0 +1,13 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+emptyenv
+
+export PATH $PATH
+define SSHDCFG /etc/ssh/sshd_config
+
+fdmove -c 2 1
+
+# NOTE: SSHD forks itself and requires the full path
+#       - i don't think this is really a concern that should be forced onto users
+exec /usr/sbin/sshd -D -e -f ${SSHDCFG}

main/s6-services/rc/net/sshd.1/type

@@ -0,0 +1 @@
+longrun

main/s6-services/rc/net/sshd.keygen/type

@@ -0,0 +1 @@
+oneshot

main/s6-services/rc/net/sshd.keygen/up

@@ -0,0 +1,11 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+emptyenv
+
+export PATH $PATH
+
+fdclose 1
+fdclose 2
+
+exec ssh-keygen -A

main/s6-services/rc/net/udhcpc.eth0/run

@@ -1,5 +1,11 @@
 #!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
 emptyenv
+
+export PATH $PATH
+define INTERFACE eth0
+
 fdmove -c 2 1
-export PATH /bin:/sbin:/usr/bin:/usr/sbin
-exec udhcpc -i eth0 -f -S
+
+exec udhcpc -i ${INTERFACE} -f -S

main/s6-services/rc/net/user.sshd/down

@@ -1,5 +1,6 @@
 #!/bin/execlineb -P
 emptyenv
+fdclose 1
+fdclose 2
 export PATH /bin:/sbin:/usr/bin:/usr/sbin
-fdmove -c 2 1
-exec ntpd -n -dd -p pool.ntp.org
+exec userdel sshd

main/s6-services/rc/net/user.sshd/type

@@ -0,0 +1 @@
+oneshot

main/s6-services/rc/net/user.sshd/up

@@ -0,0 +1,13 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+emptyenv
+
+export PATH $PATH
+define SHELL /sbin/nologin
+define USER sshd
+
+fdclose 1
+fdclose 2
+
+exec useradd -s ${SHELL} -H -D ${USER}