From d5ee66fecc5a577dfe8af5c67fe271cef6ec446a Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 16 Jul 2021 11:38:51 +0200
Subject: [libvirt/libvirt-users] Move libvirt-qemu user to main module

---
 core/modules/libvirt/module.build | 14 ++++++++++++++
 core/modules/libvirt/module.conf  |  4 ----
 2 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'core/modules/libvirt')

diff --git a/core/modules/libvirt/module.build b/core/modules/libvirt/module.build
index 730af022..3672b4c2 100644
--- a/core/modules/libvirt/module.build
+++ b/core/modules/libvirt/module.build
@@ -1,4 +1,16 @@
 #!/bin/bash
+
+module_init() {
+	local uid gid
+	# TODO theye functions suck, make thin wrappers around useradd et al.
+	gid="$( add_system_group "kvm" )"
+	uid="$( USER="libvirt-qemu" \
+		GROUPID="$gid" \
+		add_system_user )"
+	[ -z "$uid" ] && perror "Could not create libvirt-qemu user"
+	(( uid >= 1000 )) && perror "libvirt-qemu user has uid >= 1000"
+}
+
 fetch_source() {
 	:
 }
@@ -9,6 +21,8 @@ build() {
 
 post_copy() {
 	# remove default network configuration
+	# TODO: Some REQUIRED_DELETIONS var that handles this? This would not
+	# do the right thing in MiniLinux mode.
 	rm "/etc/libvirt/qemu/networks/default.xml"
 	rm "/etc/libvirt/qemu/networks/autostart/default.xml"
 }
diff --git a/core/modules/libvirt/module.conf b/core/modules/libvirt/module.conf
index d67344f7..668ddf88 100644
--- a/core/modules/libvirt/module.conf
+++ b/core/modules/libvirt/module.conf
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-REQUIRED_MODULES="
-        libvirt-users
-"
-
 REQUIRED_BINARIES=""
 REQUIRED_LIBRARIES=""
 REQUIRED_DIRECTORIES=""
-- 
cgit v1.2.3-55-g7522