desktop bundle removal and templating, add ceph

main/nnd-s6-services/APKBUILD

@@ -3,7 +3,7 @@
 . ../../APKBUILD.template
 
 pkgname=nnd-s6-services
-pkgver=1.16
+pkgver=1.17
 pkgrel=0
 pkgdesc="Base services for s6"
 depends="s6-rc s6-portable-utils s6-linux-utils"

main/nnd-s6-services/env/ceph/CONFIG

@@ -0,0 +1 @@
+/etc/ceph/ceph.conf

main/nnd-s6-services/env/sshd.1/SSHDCFG

@@ -0,0 +1 @@
+/etc/ssh/sshd_config

main/nnd-s6-services/env/virtinterfaced/CONFIG

@@ -0,0 +1 @@
+/etc/libvirt/virtinterfaced

main/nnd-s6-services/env/virtlockd/CONFIG

@@ -0,0 +1 @@
+/etc/libvirt/virtlockd

main/nnd-s6-services/env/virtlogd/CONFIG

@@ -0,0 +1 @@
+/etc/libvirt/virtlogd

main/nnd-s6-services/env/virtnetworkd/CONFIG

@@ -0,0 +1 @@
+/etc/libvirt/virtnetworkd

main/nnd-s6-services/env/virtnodedevd/CONFIG

@@ -0,0 +1 @@
+/etc/libvirt/virtnodedevd

main/nnd-s6-services/env/virtproxyd/CONFIG

@@ -0,0 +1 @@
+/etc/libvirt/virtproxyd

main/nnd-s6-services/env/virtqemud/CONFIG

@@ -0,0 +1 @@
+/etc/libvirt/virtqemud

main/nnd-s6-services/env/virtstoraged/CONFIG

@@ -0,0 +1 @@
+/etc/libvirt/virtstoraged

main/nnd-s6-services/manage.sh

@@ -42,11 +42,9 @@ update() {
 }
 
 swap() {
-	if [ -d "$S6_SV_PATH/current.$DB_FRESH_NAC" ]; then
-		ln -sfn "current.$DB_FRESH_NAC" "$S6_SV_PATH/current" || ERR="$?" error "Failed to update A/B current symlink"
-	else
-		error "There's no database to switch to"
-	fi
+	[ -d "$S6_SV_PATH/current.$DB_FRESH_NAC" ] || error "There's no database to switch to"
+
+	ln -sfn "current.$DB_FRESH_NAC" "$S6_SV_PATH/current" || ERR="$?" error "Failed to update A/B current symlink"
 }
 
 dist() {
@@ -66,6 +64,13 @@ distdefs() {
 	done
 }
 
+custom() {
+	local SVC="$1"
+	[ -h "$S6_RC_PATH/$SVC" ] || error "Service $SVC is already a custom instance"
+	rm -rf "$S6_RC_PATH/$SVC"
+	cp -r "$S6_DIST_PATH/rc/$SVC" "$S6_RC_PATH/$SVC"
+}
+
 for act in $@; do
 	cstate
 	case "$act" in

main/nnd-s6-services/rc/bundle.desktop/type

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

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

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

main/nnd-s6-services/rc/ceph.mds.0/run

@@ -0,0 +1,15 @@
+#!/bin/execlineb -P
+define ID 0
+define DAEMON mds
+
+s6-envdir -i /etc/s6/env/path
+importas -i PATH PATH
+
+s6-envdir -i /etc/s6/env/ceph
+importas -i CONFIG CONFIG
+
+emptyenv
+
+export PATH $PATH
+
+exec ceph-${DAEMON} -d -i $ID -c $CONFIG

main/nnd-s6-services/rc/ceph.mgr.0/run

@@ -0,0 +1,15 @@
+#!/bin/execlineb -P
+define ID 0
+define DAEMON mgr
+
+s6-envdir -i /etc/s6/env/path
+importas -i PATH PATH
+
+s6-envdir -i /etc/s6/env/ceph
+importas -i CONFIG CONFIG
+
+emptyenv
+
+export PATH $PATH
+
+exec ceph-${DAEMON} -d -i $ID -c $CONFIG

main/nnd-s6-services/rc/ceph.mon.0/run

@@ -0,0 +1,15 @@
+#!/bin/execlineb -P
+define ID 0
+define DAEMON mon
+
+s6-envdir -i /etc/s6/env/path
+importas -i PATH PATH
+
+s6-envdir -i /etc/s6/env/ceph
+importas -i CONFIG CONFIG
+
+emptyenv
+
+export PATH $PATH
+
+exec ceph-${DAEMON} -d -i $ID -c $CONFIG

main/nnd-s6-services/rc/ceph.osd.0.bluestore-primer/up

@@ -0,0 +1,17 @@
+#!/bin/execlineb -P
+define ID 0
+
+s6-envdir -i /etc/s6/env/path
+importas -i PATH PATH
+
+s6-envdir -i /etc/s6/env/ceph.osd.${ID}
+importas -i DEV DEV
+
+emptyenv
+
+export PATH $PATH
+
+fdclose 1
+fdclose 2
+
+exec ceph-bluestore-tool prime-osd-dir --dev $DEV --path /var/lib/ceph/osd/ceph-${ID} --no-mon-config

main/nnd-s6-services/rc/ceph.osd.0/run

@@ -0,0 +1,15 @@
+#!/bin/execlineb -P
+define ID 0
+define DAEMON osd
+
+s6-envdir -i /etc/s6/env/path
+importas -i PATH PATH
+
+s6-envdir -i /etc/s6/env/ceph
+importas -i CONFIG CONFIG
+
+emptyenv
+
+export PATH $PATH
+
+exec ceph-${DAEMON} -d -i $ID -c $CONFIG

main/nnd-s6-services/rc/dir.var-empty/down

@@ -4,7 +4,7 @@ importas -i PATH PATH
 emptyenv
 
 export PATH $PATH
-# DO NOT LET DIR BE EMPTY, YOU HAVE BEEN WARNED
+# WARNING: DO NOT LET DIR BE EMPTY IN ANY CASE
 define DIR /var/empty
 
 fdclose 1

main/nnd-s6-services/rc/dir.var-lock/down

@@ -4,8 +4,8 @@ importas -i PATH PATH
 emptyenv
 
 export PATH $PATH
-# DO NOT LET DIR BE EMPTY, YOU HAVE BEEN WARNED
-define DIR /var/empty
+# WARNING: DO NOT LET DIR BE EMPTY IN ANY CASE
+define DIR /var/lock
 
 fdclose 1
 fdclose 2

main/nnd-s6-services/rc/dwm.0/producer-for

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

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

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

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

@@ -1,12 +1,13 @@
 #!/bin/execlineb -P
+define TTY tty1
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/getty.tty1
+s6-envdir -i /etc/s6/env/getty.${TTY}
 importas -i BAUD BAUD
 emptyenv
 
 export PATH $PATH
-define TTY tty1
 
 fdclose 1
 fdclose 2

main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/down

@@ -1,12 +1,15 @@
 #!/bin/execlineb -P
+define INTERFACE wg-tunnel
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/interface.wg-tunnel.static.addr.4
+
+s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.addr.4
 importas -i ADDR ADDR
+
 emptyenv
 
 export PATH $PATH
-define INTERFACE wg-tunnel
 
 fdclose 1
 fdclose 2

main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/up

@@ -1,12 +1,15 @@
 #!/bin/execlineb -P
+define INTERFACE wg-tunnel
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/interface.wg-tunnel.static.addr.4
+
+s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.addr.4
 importas -i ADDR ADDR
+
 emptyenv
 
 export PATH $PATH
-define INTERFACE wg-tunnel
 
 fdclose 1
 fdclose 2

main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/down

@@ -1,12 +1,15 @@
 #!/bin/execlineb -P
+define INTERFACE wg-tunnel
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/interface.wg-tunnel.static.addr.6
+
+s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.addr.6
 importas -i ADDR ADDR
+
 emptyenv
 
 export PATH $PATH
-define INTERFACE wg-tunnel
 
 fdclose 1
 fdclose 2

main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/up

@@ -1,12 +1,15 @@
 #!/bin/execlineb -P
+define INTERFACE wg-tunnel
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/interface.wg-tunnel.static.addr.6
+
+s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.addr.6
 importas -i ADDR ADDR
+
 emptyenv
 
 export PATH $PATH
-define INTERFACE wg-tunnel
 
 fdclose 1
 fdclose 2

main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/down

@@ -1,12 +1,15 @@
 #!/bin/execlineb -P
+define INTERFACE wg-tunnel
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/interface.wg-tunnel.static.route.4
+
+s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.route.4
 importas -i ROUTE ROUTE
+
 emptyenv
 
 export PATH $PATH
-define INTERFACE wg-tunnel
 
 fdclose 1
 fdclose 2

main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/up

@@ -1,12 +1,15 @@
 #!/bin/execlineb -P
+define INTERFACE wg-tunnel
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/interface.wg-tunnel.static.route.4
+
+s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.route.4
 importas -i ROUTE ROUTE
+
 emptyenv
 
 export PATH $PATH
-define INTERFACE wg-tunnel
 
 fdclose 1
 fdclose 2

main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/down

@@ -1,12 +1,15 @@
 #!/bin/execlineb -P
+define INTERFACE wg-tunnel
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/interface.wg-tunnel.static.route.6
+
+s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.route.6
 importas -i ROUTE ROUTE
+
 emptyenv
 
 export PATH $PATH
-define INTERFACE wg-tunnel
 
 fdclose 1
 fdclose 2

main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/up

@@ -1,12 +1,15 @@
 #!/bin/execlineb -P
+define INTERFACE wg-tunnel
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/interface.wg-tunnel.static.route.6
+
+s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.route.6
 importas -i ROUTE ROUTE
+
 emptyenv
 
 export PATH $PATH
-define INTERFACE wg-tunnel
 
 fdclose 1
 fdclose 2

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

@@ -6,4 +6,4 @@ emptyenv
 export PATH $PATH
 define READFROM /proc/kmsg
 
-redirfd -r 0 $READFROM ucspilogd
+redirfd -r 0 $READFROM exec ucspilogd

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

@@ -12,6 +12,6 @@ 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
+		} exec xargs -0 sort -u
+	} exec xargs modprobe -b -a -s
 }

main/nnd-s6-services/rc/logger.dwm/consumer-for

@@ -1 +0,0 @@
-dwm.0

main/nnd-s6-services/rc/logger.dwm/notification-fd

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

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

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

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

@@ -1,17 +1,18 @@
 #!/bin/execlineb -P
+define LOGGERNAME klogd
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 
 s6-envdir -i /etc/s6/env/logger
 importas -i LOGPREFIX LOGPREFIX
 
-s6-envdir -I /etc/s6/env/logger.klogd
+s6-envdir -I /etc/s6/env/logger.${LOGGERNAME}
 importas -i LOGSIZE LOGSIZE
 importas -i LOGARCHIVES LOGARCHIVES
 
 emptyenv
 
 export PATH $PATH
-define LOGGERNAME klogd
 
-s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}
+exec s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}

main/nnd-s6-services/rc/logger.mdevd/run

@@ -1,17 +1,18 @@
 #!/bin/execlineb -P
+define LOGGERNAME mdevd
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 
 s6-envdir -i /etc/s6/env/logger
 importas -i LOGPREFIX LOGPREFIX
 
-s6-envdir -I /etc/s6/env/logger.mdevd
+s6-envdir -I /etc/s6/env/logger.${LOGGERNAME}
 importas -i LOGSIZE LOGSIZE
 importas -i LOGARCHIVES LOGARCHIVES
 
 emptyenv
 
 export PATH $PATH
-define LOGGERNAME mdevd
 
-s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}
+exec s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}

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

@@ -1,17 +1,18 @@
 #!/bin/execlineb -P
+define LOGGERNAME ntpd
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 
 s6-envdir -i /etc/s6/env/logger
 importas -i LOGPREFIX LOGPREFIX
 
-s6-envdir -I /etc/s6/env/logger.ntpd
+s6-envdir -I /etc/s6/env/logger.${LOGGERNAME}
 importas -i LOGSIZE LOGSIZE
 importas -i LOGARCHIVES LOGARCHIVES
 
 emptyenv
 
 export PATH $PATH
-define LOGGERNAME ntpd
 
-s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}
+exec s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}

main/nnd-s6-services/rc/logger.qemu-ga/run

@@ -1,17 +1,18 @@
 #!/bin/execlineb -P
+define LOGGERNAME qemu-ga
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 
 s6-envdir -i /etc/s6/env/logger
 importas -i LOGPREFIX LOGPREFIX
 
-s6-envdir -I /etc/s6/env/logger.qemu-ga
+s6-envdir -I /etc/s6/env/logger.${LOGGERNAME}
 importas -i LOGSIZE LOGSIZE
 importas -i LOGARCHIVES LOGARCHIVES
 
 emptyenv
 
 export PATH $PATH
-define LOGGERNAME qemu-ga
 
-s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}
+exec s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}

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

@@ -1,17 +1,18 @@
 #!/bin/execlineb -P
+define LOGGERNAME sshd
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 
 s6-envdir -i /etc/s6/env/logger
 importas -i LOGPREFIX LOGPREFIX
 
-s6-envdir -I /etc/s6/env/logger.ntpd
+s6-envdir -I /etc/s6/env/logger.${LOGGERNAME}
 importas -i LOGSIZE LOGSIZE
 importas -i LOGARCHIVES LOGARCHIVES
 
 emptyenv
 
 export PATH $PATH
-define LOGGERNAME sshd
 
-s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}
+exec s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}

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

@@ -1,17 +1,18 @@
 #!/bin/execlineb -P
+define LOGGERNAME syslogd
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 
 s6-envdir -i /etc/s6/env/logger
 importas -i LOGPREFIX LOGPREFIX
 
-s6-envdir -I /etc/s6/env/logger.syslogd
+s6-envdir -I /etc/s6/env/logger.${LOGGERNAME}
 importas -i LOGSIZE LOGSIZE
 importas -i LOGARCHIVES LOGARCHIVES
 
 emptyenv
 
 export PATH $PATH
-define LOGGERNAME syslogd
 
-s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}
+exec s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}

main/nnd-s6-services/rc/logger.udevd/consumer-for

@@ -1 +0,0 @@
-udevd

main/nnd-s6-services/rc/logger.udevd/notification-fd

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

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

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

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

@@ -1,17 +1,18 @@
 #!/bin/execlineb -P
+define LOGGERNAME udhcpc
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 
 s6-envdir -i /etc/s6/env/logger
 importas -i LOGPREFIX LOGPREFIX
 
-s6-envdir -I /etc/s6/env/logger.udhcpc
+s6-envdir -I /etc/s6/env/logger.${LOGGERNAME}
 importas -i LOGSIZE LOGSIZE
 importas -i LOGARCHIVES LOGARCHIVES
 
 emptyenv
 
 export PATH $PATH
-define LOGGERNAME udhcpc
 
-s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}
+exec s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}

main/nnd-s6-services/rc/logger.xorg/consumer-for

@@ -1 +0,0 @@
-xorg.0

main/nnd-s6-services/rc/logger.xorg/notification-fd

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

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

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

main/nnd-s6-services/rc/mdevd/run

@@ -10,4 +10,4 @@ emptyenv
 export PATH $PATH
 define NOTIFYFD 3
 
-mdevd -D $NOTIFYFD -b $KBUFSZ
+exec mdevd -D $NOTIFYFD -b $KBUFSZ

main/nnd-s6-services/rc/module.apparmor/down

@@ -9,4 +9,4 @@ define MODULE apparmor
 fdclose 1
 fdclose 2
 
-exec rmmod ${MODULE}
+exec rmmod $MODULE

main/nnd-s6-services/rc/module.bridge/down

@@ -9,4 +9,4 @@ define MODULE bridge
 fdclose 1
 fdclose 2
 
-exec rmmod ${MODULE}
+exec rmmod $MODULE

main/nnd-s6-services/rc/module.bridge/up

@@ -9,4 +9,4 @@ define MODULE bridge
 fdclose 1
 fdclose 2
 
-exec modprobe ${MODULE}
+exec modprobe $MODULE

main/nnd-s6-services/rc/module.dm-mod/down

@@ -9,4 +9,4 @@ define MODULE dm-mod
 fdclose 1
 fdclose 2
 
-exec rmmod ${MODULE}
+exec rmmod $MODULE

main/nnd-s6-services/rc/module.fuse/down

@@ -9,4 +9,4 @@ define MODULE fuse
 fdclose 1
 fdclose 2
 
-exec rmmod ${MODULE}
+exec rmmod $MODULE

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

@@ -9,4 +9,4 @@ define MODULE ipv6
 fdclose 1
 fdclose 2
 
-exec rmmod ${MODULE}
+exec rmmod $MODULE

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

@@ -9,4 +9,4 @@ define MODULE ipv6
 fdclose 1
 fdclose 2
 
-exec modprobe ${MODULE}
+exec modprobe $MODULE

main/nnd-s6-services/rc/module.kvm/down

@@ -9,4 +9,4 @@ define MODULE kvm
 fdclose 1
 fdclose 2
 
-exec rmmod ${MODULE}
+exec rmmod $MODULE

main/nnd-s6-services/rc/module.tun/down

@@ -9,4 +9,4 @@ define MODULE tun
 fdclose 1
 fdclose 2
 
-exec rmmod ${MODULE}
+exec rmmod $MODULE

main/nnd-s6-services/rc/module.wireguard/down

@@ -9,4 +9,4 @@ define MODULE wireguard
 fdclose 1
 fdclose 2
 
-exec rmmod ${MODULE}
+exec rmmod $MODULE

main/nnd-s6-services/rc/mount.boot-efi/up

@@ -1,14 +1,18 @@
 #!/bin/execlineb -P
+define DEST /boot/efi
+define CLEANDEST boot-efi
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/mount.boot-efi
+
+s6-envdir -i /etc/s6/env/mount.${CLEANDEST}
 importas -i SRC SRC
 importas -i FSTYPE FSTYPE
 importas -i OPTS OPTS
+
 emptyenv
 
 export PATH $PATH
-define DEST /boot/efi
 
 fdclose 1
 fdclose 2

main/nnd-s6-services/rc/mount.boot/up

@@ -1,14 +1,18 @@
 #!/bin/execlineb -P
+define DEST /boot
+define CLEANDEST boot
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/mount.boot
+
+s6-envdir -i /etc/s6/env/mount.${CLEANDEST}
 importas -i SRC SRC
 importas -i FSTYPE FSTYPE
 importas -i OPTS OPTS
+
 emptyenv
 
 export PATH $PATH
-define DEST /boot
 
 fdclose 1
 fdclose 2

main/nnd-s6-services/rc/mount.dev-cgroup/up

@@ -1,13 +1,17 @@
 #!/bin/execlineb -P
+define DEST /dev/cgroup
+define CLEANDEST dev-cgroup
+define FSTYPE cgroup
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/mount.dev-cgroup
+
+s6-envdir -i /etc/s6/env/mount.${CLEANDEST}
 importas -i OPTS OPTS
+
 emptyenv
 
 export PATH $PATH
-define DEST /dev/cgroup
-define FSTYPE cgroup
 
 fdclose 1
 fdclose 2

main/nnd-s6-services/rc/mount.dev-hugepages/up

@@ -1,13 +1,17 @@
 #!/bin/execlineb -P
+define DEST /dev/hugepages
+define CLEANDEST dev-hugepages
+define FSTYPE hugetlbfs
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/mount.dev-hugepages
+
+s6-envdir -i /etc/s6/env/mount.${CLEANDEST}
 importas -i OPTS OPTS
+
 emptyenv
 
 export PATH $PATH
-define DEST /dev/hugepages
-define FSTYPE hugetlbfs
 
 fdclose 1
 fdclose 2

main/nnd-s6-services/rc/mount.dev-mqueue/up

@@ -1,13 +1,17 @@
 #!/bin/execlineb -P
+define DEST /dev/mqueue
+define CLEANDEST dev-mqueue
+define FSTYPE mqueue
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/mount.dev-mqueue
+
+s6-envdir -i /etc/s6/env/mount.${CLEANDEST}
 importas -i OPTS OPTS
+
 emptyenv
 
 export PATH $PATH
-define DEST /dev/mqueue
-define FSTYPE mqueue
 
 fdclose 1
 fdclose 2

main/nnd-s6-services/rc/mount.dev-pts/up

@@ -1,17 +1,22 @@
 #!/bin/execlineb -P
+define DEST /dev/pts
+define CLEANDEST dev-pts
+define FSTYPE devpts
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/mount.dev-pts
+
+s6-envdir -i /etc/s6/env/mount.${CLEANDEST}
 importas -i OPTS OPTS
+
 emptyenv
 
 export PATH $PATH
-define DEST /dev/pts
-define FSTYPE devpts
 
 fdclose 1
 fdclose 2
 
+# TODO: Handle PTS being potentially mounted ahead of service execution (initrd)
 foreground {
 	foreground {
 		exec mkdir -p $DEST

main/nnd-s6-services/rc/mount.dev-shm/up

@@ -1,13 +1,17 @@
 #!/bin/execlineb -P
+define DEST /dev/shm
+define CLEANDEST dev-shm
+define FSTYPE shm
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/mount.dev-shm
+
+s6-envdir -i /etc/s6/env/mount.${CLEANDEST}
 importas -i OPTS OPTS
+
 emptyenv
 
 export PATH $PATH
-define DEST /dev/shm
-define FSTYPE shm
 
 fdclose 1
 fdclose 2

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

@@ -1,17 +1,22 @@
 #!/bin/execlineb -P
+define DEST /dev
+define CLEANDEST dev
+define FSTYPE devtmpfs
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/mount.dev
+
+s6-envdir -i /etc/s6/env/mount.${CLEANDEST}
 importas -i OPTS OPTS
+
 emptyenv
 
 export PATH $PATH
-define DEST /dev
-define FSTYPE devtmpfs
 
 fdclose 1
 fdclose 2
 
+# TODO: Handle devtmpfs being potentially mounted ahead of service execution (initrd)
 foreground {
 	foreground {
 		exec mkdir -p $DEST

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

@@ -1,17 +1,22 @@
 #!/bin/execlineb -P
+define DEST /proc
+define CLEANDEST proc
+define FSTYPE procfs
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/mount.proc
+
+s6-envdir -i /etc/s6/env/mount.${CLEANDEST}
 importas -i OPTS OPTS
+
 emptyenv
 
 export PATH $PATH
-define DEST /proc
-define FSTYPE procfs
 
 fdclose 1
 fdclose 2
 
+# TODO: Handle procfs being potentially mounted ahead of service execution (initrd)
 foreground {
 	foreground {
 		exec mkdir -p $DEST

main/nnd-s6-services/rc/mount.root/down

@@ -5,8 +5,9 @@ emptyenv
 
 export PATH $PATH
 define DEST /
+define OPTS remount,ro
 
 fdclose 1
 fdclose 2
 
-exec mount -o remount,ro none $DEST
+exec mount -o $OPTS none $DEST

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

@@ -1,17 +1,22 @@
 #!/bin/execlineb -P
+define DEST /run
+define CLEANDEST run
+define FSTYPE tmpfs
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/mount.run
+
+s6-envdir -i /etc/s6/env/mount.${CLEANDEST}
 importas -i OPTS OPTS
+
 emptyenv
 
 export PATH $PATH
-define DEST /run
-define FSTYPE tmpfs
 
 fdclose 1
 fdclose 2
 
+# TODO: Handle tmpfs being potentially mounted ahead of service execution (initrd)
 foreground {
 	foreground {
 		exec mkdir -p $DEST

main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/up

@@ -1,21 +1,21 @@
 #!/bin/execlineb -P
+define DEST /sys/firmware/efi/efivars
+define CLEANDEST sys-firmware-efi-efivars
+define FSTYPE efivarfs
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/mount.sys-firmware-efi-efivars
+
+s6-envdir -i /etc/s6/env/mount.${CLEANDEST}
 importas -i OPTS OPTS
+
 emptyenv
 
 export PATH $PATH
-define DEST /sys/firmware/efi/efivars
-define FSTYPE efivarfs
 
 fdclose 1
 fdclose 2
 
 foreground {
-	foreground {
-		exec mkdir -p $DEST
-	} exec mount -t $FSTYPE -o $OPTS none $DEST
-} if -nt {
-	importas status ? test $status -eq 1
-}
+	exec mkdir -p $DEST
+} exec mount -t $FSTYPE -o $OPTS none $DEST

main/nnd-s6-services/rc/mount.sys-fs-pstore/up

@@ -1,21 +1,21 @@
 #!/bin/execlineb -P
+define DEST /sys/fs/pstore
+define CLEANDEST sys-fs-pstore
+define FSTYPE pstore
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/mount.sys-fs-pstore
+
+s6-envdir -i /etc/s6/env/mount.${CLEANDEST}
 importas -i OPTS OPTS
+
 emptyenv
 
 export PATH $PATH
-define DEST /sys/fs/pstore
-define FSTYPE pstore
 
 fdclose 1
 fdclose 2
 
 foreground {
-	foreground {
-		exec mkdir -p $DEST
-	} exec mount -t $FSTYPE -o $OPTS none $DEST
-} if -nt {
-	importas status ? test $status -eq 1
-}
+	exec mkdir -p $DEST
+} exec mount -t $FSTYPE -o $OPTS none $DEST

main/nnd-s6-services/rc/mount.sys-kernel-security/up

@@ -1,21 +1,21 @@
 #!/bin/execlineb -P
+define DEST /sys/kernel/security
+define CLEANDEST sys-kernel-security
+define FSTYPE securityfs
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/mount.sys-kernel-security
+
+s6-envdir -i /etc/s6/env/mount.${CLEANDEST}
 importas -i OPTS OPTS
+
 emptyenv
 
 export PATH $PATH
-define DEST /sys/kernel/security
-define FSTYPE securityfs
 
 fdclose 1
 fdclose 2
 
 foreground {
-	foreground {
-		exec mkdir -p $DEST
-	} exec mount -t $FSTYPE -o $OPTS none $DEST
-} if -nt {
-	importas status ? test $status -eq 1
-}
+	exec mkdir -p $DEST
+} exec mount -t $FSTYPE -o $OPTS none $DEST

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

@@ -1,17 +1,22 @@
 #!/bin/execlineb -P
+define DEST /sys
+define CLEANDEST sys
+define FSTYPE sysfs
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/mount.sys
+
+s6-envdir -i /etc/s6/env/mount.${CLEANDEST}
 importas -i OPTS OPTS
+
 emptyenv
 
 export PATH $PATH
-define DEST /sys
-define FSTYPE sysfs
 
 fdclose 1
 fdclose 2
 
+# TODO: Handle sysfs being potentially mounted ahead of service execution (initrd)
 foreground {
 	foreground {
 		exec mkdir -p $DEST

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

@@ -1,17 +1,22 @@
 #!/bin/execlineb -P
+define DEST /tmp
+define CLEANDEST tmp
+define FSTYPE tmpfs
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/mount.tmp
+
+s6-envdir -i /etc/s6/env/mount.${CLEANDEST}
 importas -i OPTS OPTS
+
 emptyenv
 
 export PATH $PATH
-define DEST /tmp
-define FSTYPE tmpfs
 
 fdclose 1
 fdclose 2
 
+# TODO: Handle tmpfs being potentially mounted ahead of service execution (initrd)
 foreground {
 	foreground {
 		exec mkdir -p $DEST

main/nnd-s6-services/rc/nftables/up

@@ -1,9 +1,11 @@
 #!/bin/execlineb -P
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
+
 s6-envdir -i /etc/s6/env/nftables
 importas -i RULESET RULESET
 importas -i RULEDIR RULEDIR
+
 emptyenv
 
 export PATH $PATH

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

@@ -1,8 +1,10 @@
 #!/bin/execlineb -P
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
+
 s6-envdir -i /etc/s6/env/ntpd.1
 importas -i NTPS NTPS
+
 emptyenv
 
 export PATH $PATH

main/nnd-s6-services/rc/qemu-ga/run

@@ -7,4 +7,4 @@ export PATH $PATH
 define METHOD virtio-serial
 define COMMPATH /dev/virtio-ports/org.qemu.guest_agent.0
 
-qemu-ga --method $METHOD --path $COMMPATH -r
+exec qemu-ga --method $METHOD --path $COMMPATH -r

main/nnd-s6-services/rc/radvd/run

@@ -9,4 +9,4 @@ emptyenv
 
 export PATH $PATH
 
-radvd -n -m syslog -C $CONFIG
+exec radvd -n -m syslog -C $CONFIG

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

@@ -1,13 +1,16 @@
 #!/bin/execlineb -P
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
+
+s6-envdir -i /etc/s6/env/sshd.1
+importas -i SSHDCFG SSHDCFG
+
 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}
+/usr/sbin/sshd -D -e -f ${SSHDCFG}

main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/up

@@ -1,14 +1,18 @@
 #!/bin/execlineb -P
+define FPATH kernel/mm/ksm/run
+define CLEANPATH kernel-mm-ksm-run
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/sys.kernel-mm-ksm-run
+
+s6-envdir -i /etc/s6/env/sys.${CLEANPATH}
 importas -i VAL VAL
+
 emptyenv
 
 export PATH $PATH
-define FPATH /sys/kernel/mm/ksm/run
 
 fdclose 1
 fdclose 2
 
-redirfd -w 1 $FPATH echo $VAL
+redirfd -w 1 /sys/${FPATH} echo $VAL

main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/up

@@ -1,14 +1,18 @@
 #!/bin/execlineb -P
+define FPATH kernel/mm/transparent_hugepage/enabled
+define CLEANPATH kernel-mm-transparent_hugepage-enabled
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/sys.kernel-mm-transparent_hugepage-enabled
+
+s6-envdir -i /etc/s6/env/sys.${CLEANPATH}
 importas -i VAL VAL
+
 emptyenv
 
 export PATH $PATH
-define FPATH /sys/kernel/mm/transparent_hugepage/enabled
 
 fdclose 1
 fdclose 2
 
-redirfd -w 1 $FPATH echo $VAL
+redirfd -w 1 /sys/${FPATH} echo $VAL

main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/up

@@ -1,12 +1,16 @@
 #!/bin/execlineb -P
+define SYSCTL vm/nr_hugepages
+define CLEANPATH vm-nr_hugepages
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/sysctl.vm-nr_hugepages
+
+s6-envdir -i /etc/s6/env/sysctl.${CLEANPATH}
 importas -i VAL VAL
+
 emptyenv
 
 export PATH $PATH
-define SYSCTL vm/nr_hugepages
 
 fdclose 1
 fdclose 2

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

@@ -8,4 +8,4 @@ export PATH $PATH
 define RUNAS nobody
 
 s6-envuidgid ${RUNAS}
-s6-socklog -d3 -U -t3000
+exec s6-socklog -d3 -U -t3000

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

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