Multiple misc changes
- Add podman services - Change dist service path - Fix udev
This commit is contained in:
parent
1bfcce5b79
commit
0459973315
GPG Key ID:
F92BA85F61F4C173
|
|
@ -3,12 +3,12 @@
|
|||
. ../../APKBUILD.template
|
||||
|
||||
pkgname=nnd-s6-services
|
||||
pkgver=2.40
|
||||
pkgrel=1
|
||||
pkgver=2.46
|
||||
pkgrel=0
|
||||
pkgdesc="Base services for s6"
|
||||
depends="s6-rc s6-portable-utils s6-linux-utils"
|
||||
builddir="$srcdir/"
|
||||
_distpfx="etc/s6/dist"
|
||||
_distpfx="usr/share/nnd/s6/dist"
|
||||
options=""
|
||||
|
||||
prepare() {
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ alt_ab() {
|
|||
}
|
||||
|
||||
: ${S6_PATH:='/etc/s6'}
|
||||
: ${S6_DIST_PATH:="$S6_PATH/dist"}
|
||||
: ${S6_DIST_PATH:="/usr/share/nnd/s6/dist"}
|
||||
: ${S6_RC_PATH:="$S6_PATH/rc"}
|
||||
: ${S6_ENV_PATH:="$S6_PATH/env"}
|
||||
: ${S6_SV_PATH:="$S6_PATH/sv"}
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
bundle
|
||||
|
|
@ -0,0 +1 @@
|
|||
bundle
|
||||
|
|
@ -0,0 +1 @@
|
|||
podman.CID
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
#!/bin/execlineb -P
|
||||
export NAME podman.CID
|
||||
|
||||
/usr/libexec/nnd/s6/logger
|
||||
|
|
@ -0,0 +1 @@
|
|||
longrun
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
#!/bin/execlineb -P
|
||||
export MODULE br_netfilter
|
||||
|
||||
/usr/libexec/nnd/s6/rmmod
|
||||
|
|
@ -0,0 +1 @@
|
|||
oneshot
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
#!/bin/execlineb -P
|
||||
export MODULE br_netfilter
|
||||
|
||||
/usr/libexec/nnd/s6/modprobe
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
#!/bin/execlineb -P
|
||||
export MODULE overlay
|
||||
|
||||
/usr/libexec/nnd/s6/rmmod
|
||||
|
|
@ -0,0 +1 @@
|
|||
oneshot
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
#!/bin/execlineb -P
|
||||
export MODULE overlay
|
||||
|
||||
/usr/libexec/nnd/s6/modprobe
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
#!/bin/execlineb -P
|
||||
export rw,nosuid,nodev,noexec,relatime,nsdelegate
|
||||
export OPTS rw,nosuid,nodev,noexec,relatime,nsdelegate
|
||||
export FSTYPE cgroup2
|
||||
s6-envdir -I /etc/s6/env/mount.sys-fs-cgroup
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
logger.podman.CID
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
#!/bin/execlineb -P
|
||||
export CONTAINERID CID
|
||||
|
||||
/usr/libexec/nnd/s6/podman
|
||||
|
|
@ -0,0 +1 @@
|
|||
longrun
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
#!/bin/execlineb -P
|
||||
export VAL 0
|
||||
export SYSCTL net/bridge/bridge-nf-call-ip6tables
|
||||
/usr/libexec/nnd/s6/sysctl
|
||||
|
|
@ -0,0 +1 @@
|
|||
oneshot
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
#!/bin/execlineb -P
|
||||
export VAL 1
|
||||
s6-envdir -I /etc/s6/env/sysctl.net-bridge-bridge-nf-call-ip6tables
|
||||
|
||||
export SYSCTL net/bridge/bridge-nf-call-ip6tables
|
||||
/usr/libexec/nnd/s6/sysctl
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
#!/bin/execlineb -P
|
||||
export VAL 0
|
||||
export SYSCTL net/bridge/bridge-nf-call-iptables
|
||||
/usr/libexec/nnd/s6/sysctl
|
||||
|
|
@ -0,0 +1 @@
|
|||
oneshot
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
#!/bin/execlineb -P
|
||||
export VAL 1
|
||||
s6-envdir -I /etc/s6/env/sysctl.net-bridge-bridge-nf-call-iptables
|
||||
|
||||
export SYSCTL net/bridge/bridge-nf-call-iptables
|
||||
/usr/libexec/nnd/s6/sysctl
|
||||
|
|
@ -0,0 +1 @@
|
|||
oneshot
|
||||
|
|
@ -2,4 +2,4 @@
|
|||
s6-envdir -i /etc/s6/env/path
|
||||
emptyenv -p
|
||||
|
||||
udevadm trigger
|
||||
udevadm trigger --type=devices --action=add
|
||||
|
|
@ -0,0 +1 @@
|
|||
oneshot
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
#!/bin/execlineb -P
|
||||
s6-envdir -i /etc/s6/env/path
|
||||
emptyenv -p
|
||||
|
||||
udevadm trigger --type=subsystems --action=add
|
||||
|
|
@ -1 +1 @@
|
|||
oneshot
|
||||
bundle
|
||||
|
|
|
|||
|
|
@ -2,4 +2,6 @@
|
|||
s6-envdir -i /etc/s6/env/path
|
||||
emptyenv -p
|
||||
|
||||
udevd
|
||||
fdmove -c 2 1
|
||||
|
||||
udevd -D
|
||||
|
|
|
|||
|
|
@ -0,0 +1,9 @@
|
|||
#!/bin/execlineb -W
|
||||
importas -i CONTAINERID CONTAINERID
|
||||
|
||||
s6-envdir -I /etc/s6/env/path
|
||||
emptyenv -p
|
||||
|
||||
fdmove -c 2 1
|
||||
|
||||
podman start -a --sig-proxy $CONTAINERID
|
||||
Loading…
Reference in New Issue