From a4a20cc34f706e584dfbe6193e7d07c2750f8056 Mon Sep 17 00:00:00 2001 From: Erik Skultety Date: Mon, 3 Aug 2020 17:20:59 +0200 Subject: [PATCH] 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 Reviewed-by: Pavel Hrdina --- src/remote/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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, }