From: Andrea Bolognani <abologna@redhat.com>
Date: Sun, 30 Apr 2023 09:07:49 +0000 (+0200)
Subject: meson: Fix qemu_{user,group} defaults for Arch
X-Git-Tag: v9.4.0-rc1~110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f197ab6959b2f2c39c922c3ffbdbf45aa6e8eb6;p=thirdparty%2Flibvirt.git

meson: Fix qemu_{user,group} defaults for Arch

The current values might have been accurate at the time
when the logic was introduced, but these days Arch is
using the same ones as Debian.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat>
---

diff --git a/meson.build b/meson.build
index bad13c0c9d..09c3ab00f4 100644
--- a/meson.build
+++ b/meson.build
@@ -1614,20 +1614,18 @@ if not get_option('driver_qemu').disabled()
         qemu_group = 'wheel'
       else
         os_release = run_command('grep', '-E', '^ID(_LIKE)*=', '/etc/os-release', check: false).stdout()
-        if os_release.contains('arch')
-          qemu_user = 'nobody'
-          qemu_group = 'nobody'
         # RHEL and CentOS both have ID_LIKE=fedora, SLES has ID_LIKE=suse
-        elif (os_release.contains('fedora') or
-              os_release.contains('gentoo') or
-              os_release.contains('suse'))
+        if (os_release.contains('fedora') or
+            os_release.contains('gentoo') or
+            os_release.contains('suse'))
           qemu_user = 'qemu'
           qemu_group = 'qemu'
         # Ubuntu has ID_LIKE=debian so we need to handle it first
         elif os_release.contains('ubuntu')
           qemu_user = 'libvirt-qemu'
           qemu_group = 'kvm'
-        elif os_release.contains('debian')
+        elif (os_release.contains('arch') or
+              os_release.contains('debian'))
           qemu_user = 'libvirt-qemu'
           qemu_group = 'libvirt-qemu'
         else