Add lxd service and remove apparmor module as it doesn't make sense to late-load it

2023-02-03 18:56:03 +00:00 · 2023-02-03 18:56:03 +00:00 · 475c6042a3
parent 8b22782c35
commit 475c6042a3
15 changed files with 18 additions and 10 deletions
--- a/main/nnd-s6-services/APKBUILD
+++ b/main/nnd-s6-services/APKBUILD
@ -3,7 +3,7 @@
 . ../../APKBUILD.template

 pkgname=nnd-s6-services
-pkgver=2.8
+pkgver=2.9
 pkgrel=0
 pkgdesc="Base services for s6"
 depends="s6-rc s6-portable-utils s6-linux-utils"
--- a/main/nnd-s6-services/rc/logger.lxd/consumer-for
+++ b/main/nnd-s6-services/rc/logger.lxd/consumer-for
@ -0,0 +1 @@
+lxd
--- a/main/nnd-s6-services/rc/logger.lxd/dependencies.d/dir.var-log
+++ b/main/nnd-s6-services/rc/logger.lxd/dependencies.d/dir.var-log
--- a/main/nnd-s6-services/rc/logger.lxd/notification-fd
+++ b/main/nnd-s6-services/rc/logger.lxd/notification-fd
@ -0,0 +1 @@
+3
--- a/main/nnd-s6-services/rc/logger.lxd/run
+++ b/main/nnd-s6-services/rc/logger.lxd/run
@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+export NAME lxd
+
+/usr/libexec/nnd/s6/logger
--- a/main/nnd-s6-services/rc/logger.lxd/type
+++ b/main/nnd-s6-services/rc/logger.lxd/type
@ -0,0 +1 @@
+longrun
--- a/main/nnd-s6-services/rc/lxd/dependencies.d/mount.root
+++ b/main/nnd-s6-services/rc/lxd/dependencies.d/mount.root
--- a/main/nnd-s6-services/rc/lxd/dependencies.d/mount.sys-fs-cgroup
+++ b/main/nnd-s6-services/rc/lxd/dependencies.d/mount.sys-fs-cgroup
--- a/main/nnd-s6-services/rc/lxd/dependencies.d/mount.sys-kernel-security
+++ b/main/nnd-s6-services/rc/lxd/dependencies.d/mount.sys-kernel-security
--- a/main/nnd-s6-services/rc/lxd/producer-for
+++ b/main/nnd-s6-services/rc/lxd/producer-for
@ -0,0 +1 @@
+logger.lxd
--- a/main/nnd-s6-services/rc/lxd/run
+++ b/main/nnd-s6-services/rc/lxd/run
@ -0,0 +1,8 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
+
+# Log everything to stdout
+fdmove -c 2 1
+
+lxd -v
--- a/main/nnd-s6-services/rc/lxd/type
+++ b/main/nnd-s6-services/rc/lxd/type
@ -0,0 +1 @@
+longrun
--- a/main/nnd-s6-services/rc/module.apparmor/down
+++ b/main/nnd-s6-services/rc/module.apparmor/down
@ -1,4 +0,0 @@
-#!/bin/execlineb -P
-export MODULE apparmor
-
-/usr/libexec/nnd/s6/rmmod
--- a/main/nnd-s6-services/rc/module.apparmor/type
+++ b/main/nnd-s6-services/rc/module.apparmor/type
@ -1 +0,0 @@
-oneshot
--- a/main/nnd-s6-services/rc/module.apparmor/up
+++ b/main/nnd-s6-services/rc/module.apparmor/up
@ -1,4 +0,0 @@
-#!/bin/execlineb -P
-export MODULE apparmor
-
-/usr/libexec/nnd/s6/modprobe