From 0b157f2161563e01f9306437c81b8f174e5bc1a9 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 14 Oct 2022 15:17:21 +0200
Subject: [libvirt] Add demo user to required groups via systemd service

---
 core/modules/libvirt/data/addon-init                          |  6 ------
 .../systemd/system/multi-user.target.wants/qemu-env.service   |  1 +
 core/modules/libvirt/data/etc/systemd/system/qemu-env.service | 11 +++++++++++
 3 files changed, 12 insertions(+), 6 deletions(-)
 delete mode 100755 core/modules/libvirt/data/addon-init
 create mode 120000 core/modules/libvirt/data/etc/systemd/system/multi-user.target.wants/qemu-env.service
 create mode 100644 core/modules/libvirt/data/etc/systemd/system/qemu-env.service

(limited to 'core/modules/libvirt')

diff --git a/core/modules/libvirt/data/addon-init b/core/modules/libvirt/data/addon-init
deleted file mode 100755
index 131a03f7..00000000
--- a/core/modules/libvirt/data/addon-init
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/ash
-
-# register and start libvirt services
-systemctl daemon-reload
-systemctl start libvirtd.service
-systemctl start libvirt-guests.service
diff --git a/core/modules/libvirt/data/etc/systemd/system/multi-user.target.wants/qemu-env.service b/core/modules/libvirt/data/etc/systemd/system/multi-user.target.wants/qemu-env.service
new file mode 120000
index 00000000..1d41c8be
--- /dev/null
+++ b/core/modules/libvirt/data/etc/systemd/system/multi-user.target.wants/qemu-env.service
@@ -0,0 +1 @@
+../qemu-env.service
\ No newline at end of file
diff --git a/core/modules/libvirt/data/etc/systemd/system/qemu-env.service b/core/modules/libvirt/data/etc/systemd/system/qemu-env.service
new file mode 100644
index 00000000..7442e8da
--- /dev/null
+++ b/core/modules/libvirt/data/etc/systemd/system/qemu-env.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Setup run-virt environment for QEMU/libvirt VMs
+RefuseManualStart=true
+
+[Service]
+Type=oneshot
+ExecStart=-/usr/sbin/adduser demo libvirt-passthrough
+ExecStart=-/usr/sbin/adduser demo libvirt-tpm
+ExecStart=-/usr/sbin/adduser demo dialout
+RemainAfterExit=yes
+
-- 
cgit v1.2.3-55-g7522