Fix manager and shm mount fstype
This commit is contained in:
parent
c55bb36454
commit
fc6a3ac30f
|
@ -3,7 +3,7 @@
|
||||||
. ../../APKBUILD.template
|
. ../../APKBUILD.template
|
||||||
|
|
||||||
pkgname=nnd-s6-services
|
pkgname=nnd-s6-services
|
||||||
pkgver=1.17
|
pkgver=1.19
|
||||||
pkgrel=0
|
pkgrel=0
|
||||||
pkgdesc="Base services for s6"
|
pkgdesc="Base services for s6"
|
||||||
depends="s6-rc s6-portable-utils s6-linux-utils"
|
depends="s6-rc s6-portable-utils s6-linux-utils"
|
||||||
|
|
|
@ -66,15 +66,16 @@ distdefs() {
|
||||||
|
|
||||||
custom() {
|
custom() {
|
||||||
local SVC="$1"
|
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"
|
[ -h "$S6_RC_PATH/$SVC" ] || error "Service $SVC is already a custom instance"
|
||||||
rm -rf "$S6_RC_PATH/$SVC"
|
rm -rf "$S6_RC_PATH/$SVC"
|
||||||
cp -r "$S6_DIST_PATH/rc/$SVC" "$S6_RC_PATH/$SVC"
|
cp -r "$S6_DIST_PATH/rc/$SVC" "$S6_RC_PATH/$SVC"
|
||||||
}
|
}
|
||||||
|
|
||||||
for act in $@; do
|
cmd="$1"
|
||||||
cstate
|
shift
|
||||||
case "$act" in
|
cstate
|
||||||
generate|update|swap|dist) eval "$act" || return;;
|
case "$cmd" in
|
||||||
*) error "Invalid action $act";;
|
generate|update|swap|dist|custom) eval "$cmd" $@;;
|
||||||
esac
|
*) error "Invalid command $cmd";;
|
||||||
done
|
esac
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
define DEST /dev/shm
|
define DEST /dev/shm
|
||||||
define CLEANDEST dev-shm
|
define CLEANDEST dev-shm
|
||||||
define FSTYPE shm
|
define FSTYPE tmpfs
|
||||||
|
|
||||||
s6-envdir -i /etc/s6/env/path
|
s6-envdir -i /etc/s6/env/path
|
||||||
importas -i PATH PATH
|
importas -i PATH PATH
|
||||||
|
|
Loading…
Reference in New Issue