systemd: Drop Before=foo.service from sockets

systemd will automatically infer this dependency based on the
socket's Service=foo.service setting.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/remote/libvirtd-admin.socket.in b/src/remote/libvirtd-admin.socket.in
index 8d927db63bedcdf712a3a7be1151ac04594db30b..098e372971eedcd66ebe3249a094f8897d2acc47 100644 (file)
--- a/src/remote/libvirtd-admin.socket.in
+++ b/src/remote/libvirtd-admin.socket.in
@@ -1,6 +1,5 @@
 [Unit]
 Description=@name@ admin socket
-Before=libvirtd.service
 BindsTo=libvirtd.socket
 After=libvirtd.socket
 

diff --git a/src/remote/libvirtd-ro.socket.in b/src/remote/libvirtd-ro.socket.in
index cc10190ab4b6a3ae2ffacc0178edc7fd3562a63f..101555e8a074cd26752363477a77b7f8f6fbfc16 100644 (file)
--- a/src/remote/libvirtd-ro.socket.in
+++ b/src/remote/libvirtd-ro.socket.in
@@ -1,6 +1,5 @@
 [Unit]
 Description=@name@ local read-only socket
-Before=libvirtd.service
 BindsTo=libvirtd.socket
 After=libvirtd.socket
 

diff --git a/src/remote/libvirtd-tcp.socket.in b/src/remote/libvirtd-tcp.socket.in
index bc35f19c061a5b2ff9a7afb9d997aade86f17959..8b8fbcd01aff36607db64da1f76f9ec549dced85 100644 (file)
--- a/src/remote/libvirtd-tcp.socket.in
+++ b/src/remote/libvirtd-tcp.socket.in
@@ -1,6 +1,5 @@
 [Unit]
 Description=@name@ non-TLS IP socket
-Before=libvirtd.service
 BindsTo=libvirtd.socket
 After=libvirtd.socket
 

diff --git a/src/remote/libvirtd-tls.socket.in b/src/remote/libvirtd-tls.socket.in
index 868a0be318f3451cabb50cae0d7a69acf41dd4c3..fefda22c6b901ba52a2581868b7bd873b2793389 100644 (file)
--- a/src/remote/libvirtd-tls.socket.in
+++ b/src/remote/libvirtd-tls.socket.in
@@ -1,6 +1,5 @@
 [Unit]
 Description=@name@ TLS IP socket
-Before=libvirtd.service
 BindsTo=libvirtd.socket
 After=libvirtd.socket
 

diff --git a/src/remote/libvirtd.socket.in b/src/remote/libvirtd.socket.in
index ea0554546ae3863670d124e2a219c3c694d03eed..3019821df3d149392f23bd349c838e8089f56483 100644 (file)
--- a/src/remote/libvirtd.socket.in
+++ b/src/remote/libvirtd.socket.in
@@ -1,6 +1,5 @@
 [Unit]
 Description=@name@ local socket
-Before=libvirtd.service
 
 [Socket]
 ListenStream=@runstatedir@/libvirt/libvirt-sock

diff --git a/src/virtd-admin.socket.in b/src/virtd-admin.socket.in
index 42cc1f670fa97f1f1f236b116a96fa12c8982f4f..63db2be5fe9f0f88ce3159e75dc96e0298e1d15b 100644 (file)
--- a/src/virtd-admin.socket.in
+++ b/src/virtd-admin.socket.in
@@ -1,6 +1,5 @@
 [Unit]
 Description=@name@ admin socket
-Before=@service@.service
 BindsTo=@service@.socket
 After=@service@.socket
 Conflicts=libvirtd-admin.socket

diff --git a/src/virtd-ro.socket.in b/src/virtd-ro.socket.in
index 7b8cbdba2030776203890ecbdd6bbaa2d3be0397..32e4789b8be5a7dc24688382ee8a8253743e1b25 100644 (file)
--- a/src/virtd-ro.socket.in
+++ b/src/virtd-ro.socket.in
@@ -1,6 +1,5 @@
 [Unit]
 Description=@name@ local read-only socket
-Before=@service@.service
 BindsTo=@service@.socket
 After=@service@.socket
 Conflicts=libvirtd-ro.socket

diff --git a/src/virtd-tcp.socket.in b/src/virtd-tcp.socket.in
index 9fe90ed0a0fb4264d39155b308eff4f3d0374b67..10480d64e329ffb17a23df865817a8734841f960 100644 (file)
--- a/src/virtd-tcp.socket.in
+++ b/src/virtd-tcp.socket.in
@@ -1,6 +1,5 @@
 [Unit]
 Description=@name@ non-TLS IP socket
-Before=@service@.service
 BindsTo=@service@.socket
 After=@service@.socket
 Conflicts=libvirtd-tcp.socket

diff --git a/src/virtd-tls.socket.in b/src/virtd-tls.socket.in
index bb89daddb52b7aeb8a2415d7cac9aeac9eb0a675..83a1e343bca32da277bf631040477c47ea1c4507 100644 (file)
--- a/src/virtd-tls.socket.in
+++ b/src/virtd-tls.socket.in
@@ -1,6 +1,5 @@
 [Unit]
 Description=@name@ TLS IP socket
-Before=@service@.service
 BindsTo=@service@.socket
 After=@service@.socket
 Conflicts=libvirtd-tls.socket

diff --git a/src/virtd.socket.in b/src/virtd.socket.in
index 053dc1c7826ae71e337cbb59545a704beafa1999..d0a0bb3b1ca46e60f088b1d00a6560a012b08b97 100644 (file)
--- a/src/virtd.socket.in
+++ b/src/virtd.socket.in
@@ -1,6 +1,5 @@
 [Unit]
 Description=@name@ local socket
-Before=@service@.service
 Conflicts=libvirtd.socket
 After=libvirtd.socket