From 0bd31409c2c1b4bc76198fee8202f7a594aa49a0 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 1 Feb 2024 15:29:11 +0100
Subject: [libvirt-src/libvirt] Add demo to groups at build time, not run time

---
 core/modules/libvirt-src/module.build                         |  7 ++++++-
 .../systemd/system/multi-user.target.wants/qemu-env.service   |  1 -
 core/modules/libvirt/data/etc/systemd/system/qemu-env.service | 11 -----------
 3 files changed, 6 insertions(+), 13 deletions(-)
 delete mode 120000 core/modules/libvirt/data/etc/systemd/system/multi-user.target.wants/qemu-env.service
 delete mode 100644 core/modules/libvirt/data/etc/systemd/system/qemu-env.service

(limited to 'core')

diff --git a/core/modules/libvirt-src/module.build b/core/modules/libvirt-src/module.build
index b818b6a5..fd22d2a4 100644
--- a/core/modules/libvirt-src/module.build
+++ b/core/modules/libvirt-src/module.build
@@ -12,8 +12,13 @@ module_init() {
 	groupadd --system "${LIBVIRT_QEMU_GRP}"
 	groupadd --system "${LIBVIRT_QEMU_USR}"
 	groupadd --system "${LIBVIRT_PTHR_GRP}"
-	useradd --gid "${LIBVIRT_QEMU_GRP}" --groups "${LIBVIRT_QEMU_USR},${LIBVIRT_PTHR_GRP},${LIBVIRT_STPM_GRP}" --system \
+	useradd --gid "${LIBVIRT_QEMU_GRP}" --groups "${LIBVIRT_QEMU_USR},${LIBVIRT_PTHR_GRP},${LIBVIRT_STPM_GRP}" \
+		--system \
 		--no-create-home --home-dir "/var/lib/libvirt" "${LIBVIRT_QEMU_USR}"
+	local grp
+	for grp in libvirt-passthrough libvirt-tpm dialout; do
+		add_to_group demo "$grp" || perror "Could not add 'demo' to group '$grp'"
+	done
 }
 
 fetch_source() {
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
deleted file mode 120000
index 1d41c8be..00000000
--- a/core/modules/libvirt/data/etc/systemd/system/multi-user.target.wants/qemu-env.service
+++ /dev/null
@@ -1 +0,0 @@
-../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
deleted file mode 100644
index 7442e8da..00000000
--- a/core/modules/libvirt/data/etc/systemd/system/qemu-env.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[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