Rework services

main/nnd-s6-services/APKBUILD

@@ -1,7 +1,7 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
 pkgname=nnd-s6-services
-pkgver=0.37
+pkgver=0.45
 pkgrel=0
 pkgdesc="Base services for s6"
 url="none"

main/nnd-s6-services/env/core/getty.tty1/BAUD

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

main/nnd-s6-services/env/core/hostname/HOSTNAME

@@ -0,0 +1 @@
+nnd-localhost

main/nnd-s6-services/env/core/logger.klogd/LOGARCHIVES

@@ -0,0 +1 @@
+20

main/nnd-s6-services/env/core/logger.klogd/LOGSIZE

@@ -0,0 +1 @@
+1000000

main/nnd-s6-services/env/core/logger.mdevd/LOGARCHIVES

@@ -0,0 +1 @@
+20

main/nnd-s6-services/env/core/logger.mdevd/LOGSIZE

@@ -0,0 +1 @@
+1000000

main/nnd-s6-services/env/core/logger.syslogd/LOGARCHIVES

@@ -0,0 +1 @@
+20

main/nnd-s6-services/env/core/logger.syslogd/LOGSIZE

@@ -0,0 +1 @@
+1000000

main/nnd-s6-services/env/core/mount.boot-efi/FSTYPE

@@ -0,0 +1 @@
+vfat

main/nnd-s6-services/env/core/mount.boot-efi/OPTS

@@ -0,0 +1 @@
+rw

main/nnd-s6-services/env/core/mount.boot-efi/SRC

@@ -0,0 +1 @@
+LABEL=nnd-boot-efi

main/nnd-s6-services/env/core/mount.boot/FSTYPE

@@ -0,0 +1 @@
+ext4

main/nnd-s6-services/env/core/mount.boot/OPTS

@@ -0,0 +1 @@
+rw

main/nnd-s6-services/env/core/mount.boot/SRC

@@ -0,0 +1 @@
+LABEL=nnd-boot

main/nnd-s6-services/env/core/mount.dev-mqueue/OPTS

@@ -0,0 +1 @@
+nosuid,noexec,nodev

main/nnd-s6-services/env/core/mount.dev-pts/OPTS

@@ -0,0 +1 @@
+nosuid,noexec,mode=620,ptmxmode=000

main/nnd-s6-services/env/core/mount.dev-shm/OPTS

@@ -0,0 +1 @@
+nosuid,noexec,nodev,inode64

main/nnd-s6-services/env/core/mount.dev/OPTS

@@ -0,0 +1 @@
+nosuid,noexec,size=10240k,nr_inodes=2028666,mode=755,inode64

main/nnd-s6-services/env/core/mount.proc/OPTS

@@ -0,0 +1 @@
+nosuid,nodev,noexec,hidepid=2

main/nnd-s6-services/env/core/mount.root/FSTYPE

@@ -0,0 +1 @@
+btrfs

main/nnd-s6-services/env/core/mount.root/OPTS

@@ -0,0 +1 @@
+remount,rw

main/nnd-s6-services/env/core/mount.root/SRC

@@ -0,0 +1 @@
+none

main/nnd-s6-services/env/core/mount.run/OPTS

@@ -0,0 +1 @@
+nodev,nosuid,size=3259832k,nr_inodes=819200,mode=755,inode64

main/nnd-s6-services/env/core/mount.sys-firmware-efi-efivars/OPTS

@@ -0,0 +1 @@
+nosuid,nodev,noexec

main/nnd-s6-services/env/core/mount.sys-fs-pstore/OPTS

@@ -0,0 +1 @@
+nosuid,nodev,noexec

main/nnd-s6-services/env/core/mount.sys-kernel-security/OPTS

@@ -0,0 +1 @@
+nosuid,nodev,noexec

main/nnd-s6-services/env/core/mount.sys/OPTS

@@ -0,0 +1 @@
+nosuid,nodev,noexec

main/nnd-s6-services/env/core/mount.tmp/OPTS

@@ -0,0 +1 @@
+nodev,nosuid

main/nnd-s6-services/env/net/logger.ntpd/LOGARCHIVES

@@ -0,0 +1 @@
+20

main/nnd-s6-services/env/net/logger.ntpd/LOGSIZE

@@ -0,0 +1 @@
+1000000

main/nnd-s6-services/env/net/logger.sshd/LOGARCHIVES

@@ -0,0 +1 @@
+20

main/nnd-s6-services/env/net/logger.sshd/LOGSIZE

@@ -0,0 +1 @@
+1000000

main/nnd-s6-services/env/net/logger.udhcpc/LOGARCHIVES

@@ -0,0 +1 @@
+20

main/nnd-s6-services/env/net/logger.udhcpc/LOGSIZE

@@ -0,0 +1 @@
+1000000

main/nnd-s6-services/env/tunnel/interface.wg-tunnel.static.addr.4/ADDR

@@ -0,0 +1 @@
+172.22.12.1/32

main/nnd-s6-services/env/tunnel/interface.wg-tunnel.static.addr.6/ADDR

@@ -0,0 +1 @@
+fd42:42:42::2:1/128

main/nnd-s6-services/env/tunnel/interface.wg-tunnel.static.route.4/ROUTE

@@ -0,0 +1 @@
+172.22.12.0/24

main/nnd-s6-services/env/tunnel/interface.wg-tunnel.static.route.6/ROUTE

@@ -0,0 +1 @@
+fd42:42:42::2:0/120

main/nnd-s6-services/env/tunnel/wg-config.wg-tunnel/CONFIG

@@ -0,0 +1 @@
+/etc/wireguard/wg-tunnel

main/nnd-s6-services/env/virtual/logger.qemu-ga/LOGARCHIVES

@@ -0,0 +1 @@
+20

main/nnd-s6-services/env/virtual/logger.qemu-ga/LOGSIZE

@@ -0,0 +1 @@
+1000000

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

@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/core/path
+s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 emptyenv
 

main/nnd-s6-services/rc/core/dir.var-log/up

@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/core/path
+s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 emptyenv
 

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

@@ -1,10 +1,11 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/core/path
+s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
+s6-envdir -i /etc/s6/env/core/getty.tty1
+importas -i BAUD BAUD
 emptyenv
 
 export PATH $PATH
-define BAUD 0
 define TTY tty1
 
 fdclose 1

main/nnd-s6-services/rc/core/hostname/HOSTNAME

@@ -0,0 +1 @@
+localhost

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

@@ -1,9 +1,10 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/core/path
+s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
+s6-envdir -i /etc/s6/env/core/hostname
+importas -i HOSTNAME HOSTNAME
 emptyenv
 
-define HOSTNAME localhost
 export PATH $PATH
 
 fdclose 1

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

@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/core/path
+s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 emptyenv
 

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

@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/core/path
+s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 emptyenv
 

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

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

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

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

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

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

main/nnd-s6-services/rc/core/mdevd.coldplug/up

@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/core/path
+s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 emptyenv
 
@@ -8,4 +8,4 @@ export PATH $PATH
 fdclose 1
 fdclose 2
 
-mdevd-coldplug
+exec mdevd-coldplug

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

@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/core/path
+s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 emptyenv
 

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

@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/core/path
+s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 emptyenv
 

main/nnd-s6-services/rc/core/module.apparmor/up

@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/core/path
+s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 emptyenv
 

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

@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/core/path
+s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 emptyenv
 

main/nnd-s6-services/rc/core/module.dm-mod/up

@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/core/path
+s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 emptyenv
 

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

@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/core/path
+s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 emptyenv
 

main/nnd-s6-services/rc/core/module.fuse/up

@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/core/path
+s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 emptyenv
 

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

@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/core/path
+s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 emptyenv
 

main/nnd-s6-services/rc/core/module.tun/up

@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/core/path
+s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 emptyenv
 

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

@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/core/path
+s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 emptyenv
 

main/nnd-s6-services/rc/core/module.wireguard/up

@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/core/path
+s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 emptyenv
 

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

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

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

@@ -0,0 +1,18 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/path
+importas -i PATH PATH
+s6-envdir -i /etc/s6/env/core/mount.boot
+importas -i SRC SRC
+importas -i FSTYPE FSTYPE
+importas -i OPTS OPTS
+emptyenv
+
+export PATH $PATH
+define DEST /boot
+
+fdclose 1
+fdclose 2
+
+foreground {
+	mkdir -p $DEST
+} mount -t $FSTYPE -o $OPTS $SRC $DEST

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

@@ -1,18 +1,21 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/core/path
+s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
+s6-envdir -i /etc/s6/env/core/mount.dev-mqueue
+importas -i OPTS OPTS
 emptyenv
 
 export PATH $PATH
 define DEST /dev/mqueue
 define FSTYPE mqueue
-define OPTS nosuid,noexec,nodev
 
 fdclose 1
 fdclose 2
 
 foreground {
-	foreground { mkdir -p $DEST } mount -t $FSTYPE -o $OPTS mqueue $DEST
+	foreground {
+		mkdir -p $DEST
+	} mount -t $FSTYPE -o $OPTS mqueue $DEST
 } if -nt {
 	importas status ? test $status -eq 1
 }

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

@@ -1,18 +1,21 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/core/path
+s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
+s6-envdir -i /etc/s6/env/core/mount.dev-pts
+importas -i OPTS OPTS
 emptyenv
 
 export PATH $PATH
 define DEST /dev/pts
 define FSTYPE devpts
-define OPTS nosuid,noexec,mode=620
 
 fdclose 1
 fdclose 2
 
 foreground {
-	foreground { mkdir -p $DEST } mount -t $FSTYPE -o $OPTS pts $DEST
+	foreground {
+		mkdir -p $DEST
+	} mount -t $FSTYPE -o $OPTS pts $DEST
 } if -nt {
 	importas status ? test $status -eq 1
 }

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

@@ -1,18 +1,21 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/core/path
+s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
+s6-envdir -i /etc/s6/env/core/mount.dev-shm
+importas -i OPTS OPTS
 emptyenv
 
 export PATH $PATH
 define DEST /dev/shm
 define FSTYPE shm
-define OPTS nosuid,noexec
 
 fdclose 1
 fdclose 2
 
 foreground {
-	foreground { mkdir -p $DEST } mount -t $FSTYPE -o $OPTS shm $DEST
+	foreground {
+		mkdir -p $DEST
+	} mount -t $FSTYPE -o $OPTS shm $DEST
 } if -nt {
 	importas status ? test $status -eq 1
 }

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

@@ -1,18 +1,21 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/core/path
+s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
+s6-envdir -i /etc/s6/env/core/mount.dev
+importas -i OPTS OPTS
 emptyenv
 
 export PATH $PATH
 define DEST /dev
 define FSTYPE devtmpfs
-define OPTS nosuid,noexec,mode=755
 
 fdclose 1
 fdclose 2
 
 foreground {
-	foreground { mkdir -p $DEST } mount -t $FSTYPE -o $OPTS dev $DEST
+	foreground {
+		mkdir -p $DEST
+	} mount -t $FSTYPE -o $OPTS devtmpfs $DEST
 } if -nt {
 	importas status ? test $status -eq 1
 }

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

@@ -1,18 +1,21 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/core/path
+s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
+s6-envdir -i /etc/s6/env/core/mount.proc
+importas -i OPTS OPTS
 emptyenv
 
 export PATH $PATH
 define DEST /proc
-define FSTYPE proc
-define OPTS nosuid,nodev,noexec,hidepid=2
+define FSTYPE procfs
 
 fdclose 1
 fdclose 2
 
 foreground {
-	foreground { mkdir -p $DEST } mount -t $FSTYPE -o $OPTS proc $DEST
+	foreground {
+		mkdir -p $DEST
+	} mount -t $FSTYPE -o $OPTS procfs $DEST
 } if -nt {
 	importas status ? test $status -eq 1
 }

main/nnd-s6-services/rc/core/mount.root/type

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

main/nnd-s6-services/rc/core/mount.root/up

@@ -1,14 +1,15 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/core/path
+s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 emptyenv
 
 export PATH $PATH
 define DEST /
-define FSTYPE ext4
 define OPTS remount,rw
 
 fdclose 1
 fdclose 2
 
-foreground { mkdir -p $DEST } mount -t $FSTYPE -o $OPTS none $DEST
+foreground {
+	mkdir -p $DEST
+} mount -o $OPTS none $DEST

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

@@ -1,14 +1,17 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/core/path
+s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
+s6-envdir -i /etc/s6/env/core/mount.run
+importas -i OPTS OPTS
 emptyenv
 
 export PATH $PATH
 define DEST /run
 define FSTYPE tmpfs
-define OPTS nodev,nosuid
 
 fdclose 1
 fdclose 2
 
-foreground { mkdir -p $DEST } mount -t $FSTYPE -o $OPTS run $DEST
+foreground {
+	mkdir -p $DEST
+} mount -t $FSTYPE -o $OPTS run $DEST

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

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

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

@@ -0,0 +1,17 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/path
+importas -i PATH PATH
+s6-envdir -i /etc/s6/env/core/mount.sys-firmware-efi-efivars
+importas -i OPTS OPTS
+emptyenv
+
+export PATH $PATH
+define DEST /sys/firmware/efi/efivars
+define FSTYPE efivarfs
+
+fdclose 1
+fdclose 2
+
+foreground {
+	mkdir -p $DEST
+} mount -t $FSTYPE -o $OPTS securityfs $DEST

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

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

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

@@ -0,0 +1,17 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/path
+importas -i PATH PATH
+s6-envdir -i /etc/s6/env/core/mount.sys-fs-pstore
+importas -i OPTS OPTS
+emptyenv
+
+export PATH $PATH
+define DEST /sys/fs/pstore
+define FSTYPE pstore
+
+fdclose 1
+fdclose 2
+
+foreground {
+	mkdir -p $DEST
+} mount -t $FSTYPE -o $OPTS securityfs $DEST

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

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

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

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

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

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

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

@@ -1,14 +1,17 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/core/path
+s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
+s6-envdir -i /etc/s6/env/core/mount.tmp
+importas -i OPTS OPTS
 emptyenv
 
 export PATH $PATH
 define DEST /tmp
 define FSTYPE tmpfs
-define OPTS nodev,nosuid
 
 fdclose 1
 fdclose 2
 
-foreground { mkdir -p $DEST } mount -t $FSTYPE -o $OPTS tmp $DEST
+foreground {
+	mkdir -p $DEST
+} mount -t $FSTYPE -o $OPTS tmp $DEST