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: dd4f2c73ad

Signed-off-by: Erik Skultety <eskultet@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Erik Skultety 2020-08-03 17:20:59 +02:00
parent b175de4e18
commit a4a20cc34f

View File

@ -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,
}