[libvirt PATCH 32/42] systemd: Drop parametrization from libvirtd sockets

Up until now the files have been used as template for most services, but now that those have been converted to common templates we can drop parametrization and make it clear that these files are for libvirtd only. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- src/remote/libvirtd-admin.socket.in | 10 +++++----- src/remote/libvirtd-ro.socket.in | 10 +++++----- src/remote/libvirtd-tcp.socket.in | 8 ++++---- src/remote/libvirtd-tls.socket.in | 8 ++++---- src/remote/libvirtd.socket.in | 6 +++--- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/remote/libvirtd-admin.socket.in b/src/remote/libvirtd-admin.socket.in index 39bb0badea..8d927db63b 100644 --- a/src/remote/libvirtd-admin.socket.in +++ b/src/remote/libvirtd-admin.socket.in @@ -1,12 +1,12 @@ [Unit] Description=@name@ admin socket -Before=@service@.service -BindsTo=@service@.socket -After=@service@.socket +Before=libvirtd.service +BindsTo=libvirtd.socket +After=libvirtd.socket [Socket] -ListenStream=@runstatedir@/libvirt/@sockprefix@-admin-sock -Service=@service@.service +ListenStream=@runstatedir@/libvirt/libvirt-admin-sock +Service=libvirtd.service SocketMode=0600 [Install] diff --git a/src/remote/libvirtd-ro.socket.in b/src/remote/libvirtd-ro.socket.in index b7b7ae0dd8..cc10190ab4 100644 --- a/src/remote/libvirtd-ro.socket.in +++ b/src/remote/libvirtd-ro.socket.in @@ -1,12 +1,12 @@ [Unit] Description=@name@ local read-only socket -Before=@service@.service -BindsTo=@service@.socket -After=@service@.socket +Before=libvirtd.service +BindsTo=libvirtd.socket +After=libvirtd.socket [Socket] -ListenStream=@runstatedir@/libvirt/@sockprefix@-sock-ro -Service=@service@.service +ListenStream=@runstatedir@/libvirt/libvirt-sock-ro +Service=libvirtd.service SocketMode=0666 [Install] diff --git a/src/remote/libvirtd-tcp.socket.in b/src/remote/libvirtd-tcp.socket.in index 7c8bcdb525..bc35f19c06 100644 --- a/src/remote/libvirtd-tcp.socket.in +++ b/src/remote/libvirtd-tcp.socket.in @@ -1,12 +1,12 @@ [Unit] Description=@name@ non-TLS IP socket -Before=@service@.service -BindsTo=@service@.socket -After=@service@.socket +Before=libvirtd.service +BindsTo=libvirtd.socket +After=libvirtd.socket [Socket] ListenStream=16509 -Service=@service@.service +Service=libvirtd.service [Install] WantedBy=sockets.target diff --git a/src/remote/libvirtd-tls.socket.in b/src/remote/libvirtd-tls.socket.in index c6dceb2d4e..868a0be318 100644 --- a/src/remote/libvirtd-tls.socket.in +++ b/src/remote/libvirtd-tls.socket.in @@ -1,12 +1,12 @@ [Unit] Description=@name@ TLS IP socket -Before=@service@.service -BindsTo=@service@.socket -After=@service@.socket +Before=libvirtd.service +BindsTo=libvirtd.socket +After=libvirtd.socket [Socket] ListenStream=16514 -Service=@service@.service +Service=libvirtd.service [Install] WantedBy=sockets.target diff --git a/src/remote/libvirtd.socket.in b/src/remote/libvirtd.socket.in index aec0708fd4..ea0554546a 100644 --- a/src/remote/libvirtd.socket.in +++ b/src/remote/libvirtd.socket.in @@ -1,10 +1,10 @@ [Unit] Description=@name@ local socket -Before=@service@.service +Before=libvirtd.service [Socket] -ListenStream=@runstatedir@/libvirt/@sockprefix@-sock -Service=@service@.service +ListenStream=@runstatedir@/libvirt/libvirt-sock +Service=libvirtd.service SocketMode=@sockmode@ RemoveOnStop=yes -- 2.41.0