Re: [libvirt] [PATCH 16/41] remote: conditionalize systemd socket unit files
On Tue, 2019-07-23 at 17:02 +0100, Daniel P. Berrangé wrote:
[...]
+++ b/src/remote/Makefile.inc.am
@@ -292,6 +292,9 @@ endif WITH_SASL
LIBVIRTD_UNIT_VARS = \
$(COMMON_UNIT_VARS) \
+ -e 's|[@]name[@]|Libvirt|g' \
+ -e 's|[@]service[@]|libvirtd|g' \
+ -e 's|[@]sockprefix[@]|libvirt|g' \
$(NULL)
Patch 19 contains this hunk:
@@ -298,13 +369,34 @@ LIBVIRTD_UNIT_VARS = \
-e 's|[@]name[@]|Libvirt|g' \
-e 's|[@]service[@]|libvirtd|g' \
-e 's|[@]sockprefix[@]|libvirt|g' \
+ -e 's|[@]deps[@]||g' \
+ $(NULL)
but it should be in this commit instead, since...
[...]
+++ b/src/remote/libvirtd-admin.socket.in
@@ -1,14 +1,15 @@
[Unit]
-Description=Libvirt admin socket
-Before=libvirtd.service
-BindsTo=libvirtd.socket
-After=libvirtd.socket
+Description=@name@ admin socket
+Before=@service@.service
+BindsTo=@service@.socket
+After=@service@.socket
+@deps@
... you already have @deps@ here, and without the above the
placeholder will show up in the output file.
With that hunk squashed in,
Reviewed-by: Andrea Bolognani <abologna(a)redhat.com>
--
Andrea Bolognani / Red Hat / Virtualization