nnd
/
ports
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add cleanup, fix daemonizing and mounts

This commit is contained in:
Alex D. 2022-12-09 18:27:37 +00:00
parent 9d90d0a2b7
commit b615add75e
Signed by: caskd
GPG Key ID: F92BA85F61F4C173
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/nnd-s6-services/APKBUILD
View File

@ -3,8 +3,8 @@
. ../../APKBUILD.template
pkgname=nnd-s6-services
pkgver=2.0
pkgrel=15
pkgver=2.1
pkgrel=0
pkgdesc="Base services for s6"
depends="s6-rc s6-portable-utils s6-linux-utils"
builddir="$srcdir/"

4
main/nnd-s6-services/manage.sh
View File

@ -115,7 +115,7 @@ custom() {
return "$?"
fi
if [ -d "$target" ]; then
if ! [ -h "$target" ]; then
error "$svc is already a custom instance"
return "$?"
fi
@ -166,7 +166,7 @@ if [ -z "$cmd" ]; then
update || return "$?"
else
case "$cmd" in
generate|swap|update|dist|custom|default) eval "$cmd" $@ || return "$?";;
generate|swap|update|dist|custom|default|cleanup) eval "$cmd" $@ || return "$?";;
*) error "Invalid command $cmd"; return 1;;
esac
fi

4
main/nnd-s6-services/tmpl/libvirtd
View File

@ -5,7 +5,7 @@ s6-envdir -I /etc/s6/env/path
importas -D "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" PATH PATH
s6-envdir -I /etc/s6/env/libvirt
importas -D "/etc/libvirt/virt${NAME}d" CONFIG DEFAULTCONFIG
importas -D "/etc/libvirt/virt${NAME}d.conf" CONFIG DEFAULTCONFIG
s6-envdir -I /etc/s6/env/libvirt.${NAME}
importas -D $DEFAULTCONFIG CONFIG CONFIG
@ -13,4 +13,4 @@ importas -D $DEFAULTCONFIG CONFIG CONFIG
emptyenv
export PATH $PATH
exec virt${NAME}d -f $CONFIG -d
exec virt${NAME}d -f $CONFIG

17
main/nnd-s6-services/tmpl/mount
View File

@ -1,5 +1,5 @@
#!/bin/execlineb -W
importas -D "none" SRC SRC
importas -D "none" SRCPROVIDED SRC
importas -i DEST DEST
importas -i FSTYPE FSTYPE
importas -D "defaults" OPTS OPTS
@ -12,10 +12,11 @@ export PATH $PATH
foreground { mkdir -p $DEST }
if -nt {
foreground {
s6-mount -t $FSTYPE -o $OPTS $SRC $DEST
}
} importas -i status ? {
if -nt { test $status -eq 1 } exit $status
}
# Resolve LABEL and UUID
backtick -e -D $SRCPROVIDED SRC { findfs $SRCPROVIDED }
ifelse {
redirfd -w 1 /dev/null findmnt -t $FSTYPE $DEST
} {
exec s6-mount -t $FSTYPE -o remount,${OPTS} $SRC $DEST
} exec s6-mount -t $FSTYPE -o $OPTS $SRC $DEST