From: Erik Skultety <eskultet@redhat.com>
Date: Mon, 3 Aug 2020 15:20:59 +0000 (+0200)
Subject: meson: Fix libvirtd|virtproxyd socket prefixes
X-Git-Tag: v6.7.0-rc1~169
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4a20cc34f706e584dfbe6193e7d07c2750f8056;p=thirdparty%2Flibvirt.git

meson: Fix libvirtd|virtproxyd socket prefixes

During the switch to meson, one of the patches mistakenly changed the
runtime socket prefix for {libvirtd, virtproxyd} to "libvirtd-" from
the original "libvirt-". Not to be mistaken with the systemd unit name
which actually follows the daemon name, IOW the systemd unit name
remains as e.g. "libvirtd.socket", but the actual unix socket created
on the filesystem that the daemon binds to must be named "libvirt-sock"
and not "libvirtd-sock".

Fixes: dd4f2c73ad7f9fc0eae5325d5bf5786afd3a467e

Signed-off-by: Erik Skultety <eskultet@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
---

diff --git a/src/remote/meson.build b/src/remote/meson.build
index 25712c943b..5983238a0a 100644
--- a/src/remote/meson.build
+++ b/src/remote/meson.build
@@ -184,7 +184,7 @@ if conf.has('WITH_REMOTE')
       'service': 'libvirtd',
       'service_in': files('libvirtd.service.in'),
       'name': 'Libvirt',
-      'sockprefix': 'libvirtd',
+      'sockprefix': 'libvirt',
       'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ],
     }
 
@@ -218,7 +218,7 @@ if conf.has('WITH_REMOTE')
       'service': 'virtproxyd',
       'service_in': files('virtproxyd.service.in'),
       'name': 'Libvirt proxy',
-      'sockprefix': 'libvirtd',
+      'sockprefix': 'libvirt',
       'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ],
       'deps': libvirtd_socket_conflicts,
     }