From 0365362bb058d36f6ae5e9a1fedf6dd4bb5794b8d74c19bcb31011b88eae9543 Mon Sep 17 00:00:00 2001
From: Thorsten Kukuk <kukuk@suse.com>
Date: Fri, 13 Nov 2020 08:14:06 +0000
Subject: [PATCH] Accepting request 848225 from
 home:jfehlig:branches:Base:System

Changes necessary for jsc#SLE-11629. Please let me know if anything
needs to be done to also make these changes appear in SLE15 SP3.
Thanks!

- Add system account and groups for kvm, qemu, and libvirt
  (jsc#SLE-11629)
  New files: system-group-kvm.conf, system-group-libvirt.conf,
  system-user-qemu.conf

OBS-URL: https://build.opensuse.org/request/show/848225
OBS-URL: https://build.opensuse.org/package/show/Base:System/system-users?expand=0&rev=49
---
 system-group-kvm.conf     |  2 ++
 system-group-libvirt.conf |  2 ++
 system-user-qemu.conf     |  3 +++
 system-users.changes      |  8 +++++++
 system-users.spec         | 48 +++++++++++++++++++++++++++++++++++++++
 5 files changed, 63 insertions(+)
 create mode 100644 system-group-kvm.conf
 create mode 100644 system-group-libvirt.conf
 create mode 100644 system-user-qemu.conf

diff --git a/system-group-kvm.conf b/system-group-kvm.conf
new file mode 100644
index 0000000..ee5b865
--- /dev/null
+++ b/system-group-kvm.conf
@@ -0,0 +1,2 @@
+# Type Name ID GECOS [HOME]
+g kvm 36
diff --git a/system-group-libvirt.conf b/system-group-libvirt.conf
new file mode 100644
index 0000000..e0b86f6
--- /dev/null
+++ b/system-group-libvirt.conf
@@ -0,0 +1,2 @@
+# Type Name ID GECOS [HOME]
+g libvirt 108
diff --git a/system-user-qemu.conf b/system-user-qemu.conf
new file mode 100644
index 0000000..88fad1b
--- /dev/null
+++ b/system-user-qemu.conf
@@ -0,0 +1,3 @@
+# Type Name ID GECOS [HOME]
+g qemu 107
+u qemu 107 "qemu user"
\ No newline at end of file
diff --git a/system-users.changes b/system-users.changes
index 0a33dbe..28a2df0 100644
--- a/system-users.changes
+++ b/system-users.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Nov 12 23:36:02 UTC 2020 - James Fehlig <jfehlig@suse.com>
+
+- Add system account and groups for kvm, qemu, and libvirt
+  (jsc#SLE-11629)
+  New files: system-group-kvm.conf, system-group-libvirt.conf,
+  system-user-qemu.conf
+
 -------------------------------------------------------------------
 Fri Aug 21 18:35:50 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
 
diff --git a/system-users.spec b/system-users.spec
index 69866ee..5ab1b3a 100644
--- a/system-users.spec
+++ b/system-users.spec
@@ -40,6 +40,9 @@ Source16:       system-user-upsd.conf
 Source17:       system-user-uuidd.conf
 Source19:       system-user-tftp.conf
 Source20:       system-user-tss.conf
+Source21:       system-group-kvm.conf
+Source22:       system-user-qemu.conf
+Source23:       system-group-libvirt.conf
 BuildRequires:  sysuser-shadow
 BuildRequires:  sysuser-tools
 BuildArch:      noarch
@@ -205,6 +208,30 @@ Group:          System/Fhs
 %description -n system-user-tss
 This package provides the system account and group 'tss'.
 
+%package -n system-group-kvm
+Summary:        System group kvm
+Group:          System/Fhs
+%{sysusers_requires}
+
+%description -n system-group-kvm
+This package provides the system group 'kvm'.
+
+%package -n system-user-qemu
+Summary:        System user and group qemu
+Group:          System/Fhs
+%{sysusers_requires}
+
+%description -n system-user-qemu
+This package provides the system account and group 'qemu'.
+
+%package -n system-group-libvirt
+Summary:        System group libvirt
+Group:          System/Fhs
+%{sysusers_requires}
+
+%description -n system-group-libvirt
+This package provides the system group 'libvirt'.
+
 %prep
 %setup -q -c -T
 
@@ -227,6 +254,9 @@ This package provides the system account and group 'tss'.
 %sysusers_generate_pre %{SOURCE17} uuidd
 %sysusers_generate_pre %{SOURCE19} tftp
 %sysusers_generate_pre %{SOURCE20} tss
+%sysusers_generate_pre %{SOURCE21} kvm
+%sysusers_generate_pre %{SOURCE22} qemu
+%sysusers_generate_pre %{SOURCE23} libvirt
 
 %install
 mkdir -p %{buildroot}%{_sysusersdir}
@@ -259,6 +289,9 @@ install -m 644 %{SOURCE16} %{buildroot}%{_sysusersdir}/system-user-upsd.conf
 install -m 644 %{SOURCE17} %{buildroot}%{_sysusersdir}/system-user-uuidd.conf
 install -m 644 %{SOURCE19} %{buildroot}%{_sysusersdir}/system-user-tftp.conf
 install -m 644 %{SOURCE20} %{buildroot}%{_sysusersdir}/system-user-tss.conf
+install -m 644 %{SOURCE21} %{buildroot}%{_sysusersdir}/system-group-kvm.conf
+install -m 644 %{SOURCE22} %{buildroot}%{_sysusersdir}/system-user-qemu.conf
+install -m 644 %{SOURCE23} %{buildroot}%{_sysusersdir}/system-group-libvirt.conf
 
 %pre -n system-user-uucp -f uucp.pre
 %pre -n system-user-games -f games.pre
@@ -281,6 +314,9 @@ test -x /usr/sbin/usermod && /usr/sbin/usermod -s /bin/bash nobody ||:
 %pre -n system-user-uuidd -f uuidd.pre
 %pre -n system-user-tftp -f tftp.pre
 %pre -n system-user-tss -f tss.pre
+%pre -n system-group-kvm -f kvm.pre
+%pre -n system-user-qemu -f qemu.pre
+%pre -n system-group-libvirt -f libvirt.pre
 
 %files -n system-user-uucp
 %defattr(-,root,root)
@@ -364,4 +400,16 @@ test -x /usr/sbin/usermod && /usr/sbin/usermod -s /bin/bash nobody ||:
 %dir %attr(0750,tss,tss) /var/lib/tpm
 %{_sysusersdir}/system-user-tss.conf
 
+%files -n system-group-kvm
+%defattr(-,root,root)
+%{_sysusersdir}/system-group-kvm.conf
+
+%files -n system-user-qemu
+%defattr(-,root,root)
+%{_sysusersdir}/system-user-qemu.conf
+
+%files -n system-group-libvirt
+%defattr(-,root,root)
+%{_sysusersdir}/system-group-libvirt.conf
+
 %changelog