Add virtual bundle and add mdevd logger

main/nnd-s6-services/APKBUILD

@@ -1,14 +1,20 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
 pkgname=nnd-s6-services
-pkgver=0.23
-pkgrel=0
+pkgver=0.24
+pkgrel=1
 pkgdesc="Base services for s6"
 url="none"
 arch="noarch"
 license="MIT"
 depends="s6-rc s6-portable-utils s6-linux-utils"
-subpackages="$pkgname-core $pkgname-net $pkgname-desktop $pkgname-libvirt"
+subpackages="
+	$pkgname-core
+	$pkgname-net:_bundle
+	$pkgname-desktop:_bundle
+	$pkgname-libvirt:_bundle
+	$pkgname-virtual:_bundle
+"
 builddir="$srcdir/"
 
 prepare() {
@@ -25,23 +31,16 @@ package() {
 	install -Dm755 "$builddir"/manage.sh "$pkgdir"/usr/bin/nnd-s6
 }
 
+check() {
+	s6-rc-compile "$builddir"/compiled "$builddir"/rc/*
+}
+
 core() {
 	amove etc/s6/rc/core
 	amove etc/s6/env/core
 }
 
-net() {
-	amove etc/s6/rc/net
-}
-
-desktop() {
-	amove etc/s6/rc/desktop
-}
-
-libvirt() {
-	amove etc/s6/rc/libvirt
-}
-
-check() {
-	s6-rc-compile "$builddir"/compiled "$builddir"/rc/*
+_bundle() {
+	local _BNAME="${subpkgname##$pkgname-}"
+	amove "etc/s6/rc/$_BNAME"
 }

main/nnd-s6-services/rc/core/logger.mdevd/consumer-for

@@ -0,0 +1 @@
+mdevd

main/nnd-s6-services/rc/core/logger.mdevd/notification-fd

@@ -0,0 +1 @@
+3

main/nnd-s6-services/rc/core/logger.mdevd/run

@@ -0,0 +1,13 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+s6-envdir /etc/s6/env/core/logger
+importas -i LOGPREFIX LOGPREFIX
+emptyenv
+
+export PATH $PATH
+define LOGGERNAME mdevd
+define LOGSIZE 1000000
+define LOGARCHIVES 20
+
+s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}

main/nnd-s6-services/rc/core/logger.mdevd/type

@@ -0,0 +1 @@
+longrun

main/nnd-s6-services/rc/core/mdevd/producer-for

@@ -0,0 +1 @@
+logger.mdevd

main/nnd-s6-services/rc/virtual/bundle.virtual/type

@@ -0,0 +1 @@
+bundle

main/nnd-s6-services/rc/virtual/logger.qemu-ga/consumer-for

@@ -0,0 +1 @@
+qemu-ga

main/nnd-s6-services/rc/virtual/logger.qemu-ga/notification-fd

@@ -0,0 +1 @@
+3

main/nnd-s6-services/rc/virtual/logger.qemu-ga/run

@@ -0,0 +1,13 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+s6-envdir /etc/s6/env/core/logger
+importas -i LOGPREFIX LOGPREFIX
+emptyenv
+
+export PATH $PATH
+define LOGGERNAME qemu-ga
+define LOGSIZE 1000000
+define LOGARCHIVES 20
+
+s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}

main/nnd-s6-services/rc/virtual/logger.qemu-ga/type

@@ -0,0 +1 @@
+longrun

main/nnd-s6-services/rc/virtual/qemu-ga/producer-for

@@ -0,0 +1 @@
+logger.qemu-ga

main/nnd-s6-services/rc/virtual/qemu-ga/run

@@ -0,0 +1,10 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/core/path
+importas -i PATH PATH
+emptyenv
+
+export PATH $PATH
+define METHOD virtio-serial
+define COMMPATH /dev/virtio-ports/org.qemu.guest_agent.0
+
+qemu-ga --method $METHOD --path $COMMPATH -r

main/nnd-s6-services/rc/virtual/qemu-ga/type

@@ -0,0 +1 @@
+longrun