From 475c6042a3bb4ce1116738528b5126477d8f9e9a Mon Sep 17 00:00:00 2001 From: Alex Denes Date: Fri, 3 Feb 2023 18:56:03 +0000 Subject: [PATCH] Add lxd service and remove apparmor module as it doesn't make sense to late-load it --- main/nnd-s6-services/APKBUILD | 2 +- main/nnd-s6-services/rc/logger.lxd/consumer-for | 1 + .../dependencies.d/dir.var-log} | 0 main/nnd-s6-services/rc/logger.lxd/notification-fd | 1 + main/nnd-s6-services/rc/logger.lxd/run | 4 ++++ main/nnd-s6-services/rc/logger.lxd/type | 1 + main/nnd-s6-services/rc/lxd/dependencies.d/mount.root | 0 .../rc/lxd/dependencies.d/mount.sys-fs-cgroup | 0 .../rc/lxd/dependencies.d/mount.sys-kernel-security | 0 main/nnd-s6-services/rc/lxd/producer-for | 1 + main/nnd-s6-services/rc/lxd/run | 8 ++++++++ main/nnd-s6-services/rc/lxd/type | 1 + main/nnd-s6-services/rc/module.apparmor/down | 4 ---- main/nnd-s6-services/rc/module.apparmor/type | 1 - main/nnd-s6-services/rc/module.apparmor/up | 4 ---- 15 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 main/nnd-s6-services/rc/logger.lxd/consumer-for rename main/nnd-s6-services/rc/{module.apparmor/flag-essential => logger.lxd/dependencies.d/dir.var-log} (100%) create mode 100644 main/nnd-s6-services/rc/logger.lxd/notification-fd create mode 100755 main/nnd-s6-services/rc/logger.lxd/run create mode 100644 main/nnd-s6-services/rc/logger.lxd/type create mode 100644 main/nnd-s6-services/rc/lxd/dependencies.d/mount.root create mode 100644 main/nnd-s6-services/rc/lxd/dependencies.d/mount.sys-fs-cgroup create mode 100644 main/nnd-s6-services/rc/lxd/dependencies.d/mount.sys-kernel-security create mode 100644 main/nnd-s6-services/rc/lxd/producer-for create mode 100755 main/nnd-s6-services/rc/lxd/run create mode 100644 main/nnd-s6-services/rc/lxd/type delete mode 100644 main/nnd-s6-services/rc/module.apparmor/down delete mode 100644 main/nnd-s6-services/rc/module.apparmor/type delete mode 100644 main/nnd-s6-services/rc/module.apparmor/up diff --git a/main/nnd-s6-services/APKBUILD b/main/nnd-s6-services/APKBUILD index 281ec38..269951b 100644 --- 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" diff --git a/main/nnd-s6-services/rc/logger.lxd/consumer-for b/main/nnd-s6-services/rc/logger.lxd/consumer-for new file mode 100644 index 0000000..e34c7ef --- /dev/null +++ b/main/nnd-s6-services/rc/logger.lxd/consumer-for @@ -0,0 +1 @@ +lxd diff --git a/main/nnd-s6-services/rc/module.apparmor/flag-essential b/main/nnd-s6-services/rc/logger.lxd/dependencies.d/dir.var-log similarity index 100% rename from main/nnd-s6-services/rc/module.apparmor/flag-essential rename to main/nnd-s6-services/rc/logger.lxd/dependencies.d/dir.var-log diff --git a/main/nnd-s6-services/rc/logger.lxd/notification-fd b/main/nnd-s6-services/rc/logger.lxd/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/main/nnd-s6-services/rc/logger.lxd/notification-fd @@ -0,0 +1 @@ +3 diff --git a/main/nnd-s6-services/rc/logger.lxd/run b/main/nnd-s6-services/rc/logger.lxd/run new file mode 100755 index 0000000..686f6dd --- /dev/null +++ b/main/nnd-s6-services/rc/logger.lxd/run @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +export NAME lxd + +/usr/libexec/nnd/s6/logger diff --git a/main/nnd-s6-services/rc/logger.lxd/type b/main/nnd-s6-services/rc/logger.lxd/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/main/nnd-s6-services/rc/logger.lxd/type @@ -0,0 +1 @@ +longrun diff --git a/main/nnd-s6-services/rc/lxd/dependencies.d/mount.root b/main/nnd-s6-services/rc/lxd/dependencies.d/mount.root new file mode 100644 index 0000000..e69de29 diff --git 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 new file mode 100644 index 0000000..e69de29 diff --git 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 new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/lxd/producer-for b/main/nnd-s6-services/rc/lxd/producer-for new file mode 100644 index 0000000..aff0732 --- /dev/null +++ b/main/nnd-s6-services/rc/lxd/producer-for @@ -0,0 +1 @@ +logger.lxd diff --git a/main/nnd-s6-services/rc/lxd/run b/main/nnd-s6-services/rc/lxd/run new file mode 100755 index 0000000..418f5f1 --- /dev/null +++ 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 diff --git a/main/nnd-s6-services/rc/lxd/type b/main/nnd-s6-services/rc/lxd/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/main/nnd-s6-services/rc/lxd/type @@ -0,0 +1 @@ +longrun diff --git a/main/nnd-s6-services/rc/module.apparmor/down b/main/nnd-s6-services/rc/module.apparmor/down deleted file mode 100644 index e1ad76e..0000000 --- a/main/nnd-s6-services/rc/module.apparmor/down +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/execlineb -P -export MODULE apparmor - -/usr/libexec/nnd/s6/rmmod diff --git a/main/nnd-s6-services/rc/module.apparmor/type b/main/nnd-s6-services/rc/module.apparmor/type deleted file mode 100644 index bdd22a1..0000000 --- a/main/nnd-s6-services/rc/module.apparmor/type +++ /dev/null @@ -1 +0,0 @@ -oneshot diff --git a/main/nnd-s6-services/rc/module.apparmor/up b/main/nnd-s6-services/rc/module.apparmor/up deleted file mode 100644 index 75ad8ec..0000000 --- a/main/nnd-s6-services/rc/module.apparmor/up +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/execlineb -P -export MODULE apparmor - -/usr/libexec/nnd/s6/modprobe