diff --git a/main/nnd-s6-services/APKBUILD b/main/nnd-s6-services/APKBUILD index 93fedcc..876f51b 100644 --- a/main/nnd-s6-services/APKBUILD +++ b/main/nnd-s6-services/APKBUILD @@ -3,7 +3,7 @@ . ../../APKBUILD.template pkgname=nnd-s6-services -pkgver=1.17 +pkgver=1.19 pkgrel=0 pkgdesc="Base services for s6" depends="s6-rc s6-portable-utils s6-linux-utils" diff --git a/main/nnd-s6-services/manage.sh b/main/nnd-s6-services/manage.sh index ffe4b7c..3d561af 100755 --- a/main/nnd-s6-services/manage.sh +++ b/main/nnd-s6-services/manage.sh @@ -66,15 +66,16 @@ distdefs() { custom() { local SVC="$1" + [ -e "$S6_RC_PATH/$SVC" ] || error "Service $SVC doesn't exist" [ -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 - generate|update|swap|dist) eval "$act" || return;; - *) error "Invalid action $act";; - esac -done +cmd="$1" +shift +cstate +case "$cmd" in + generate|update|swap|dist|custom) eval "$cmd" $@;; + *) error "Invalid command $cmd";; +esac diff --git a/main/nnd-s6-services/rc/mount.dev-shm/up b/main/nnd-s6-services/rc/mount.dev-shm/up index 8811148..bb8db34 100644 --- a/main/nnd-s6-services/rc/mount.dev-shm/up +++ b/main/nnd-s6-services/rc/mount.dev-shm/up @@ -1,7 +1,7 @@ #!/bin/execlineb -P define DEST /dev/shm define CLEANDEST dev-shm -define FSTYPE shm +define FSTYPE tmpfs s6-envdir -i /etc/s6/env/path importas -i PATH PATH