systemd: simplify systemd unit files following the recent DefaultDependencies= changes

diff --git a/avahi-daemon/avahi-daemon.service.in b/avahi-daemon/avahi-daemon.service.in
index e9b81d6ae86be4c1caddb352fe24b5d3638fa4d8..a88d69e4b07d19ea354e02c729034de550182cc3 100644 (file)
--- a/avahi-daemon/avahi-daemon.service.in
+++ b/avahi-daemon/avahi-daemon.service.in
@@ -16,10 +16,9 @@
 # USA.
 
 [Unit]
-Requires=basic.target avahi-daemon.socket
-After=basic.target syslog.target avahi-daemon.socket
-Conflicts=shutdown.target
 Description=Avahi mDNS/DNS-SD Stack
+Requires=avahi-daemon.socket
+After=syslog.target
 
 [Service]
 Type=dbus

diff --git a/avahi-daemon/avahi-daemon.socket.in b/avahi-daemon/avahi-daemon.socket.in
index 90f7d36e8e063e5596a6d08bc105047481d40677..13309b8998242f3da08651c88cd27f16f230c683 100644 (file)
--- a/avahi-daemon/avahi-daemon.socket.in
+++ b/avahi-daemon/avahi-daemon.socket.in
@@ -16,9 +16,6 @@
 # USA.
 
 [Unit]
-After=sysinit.target
-Before=sockets.target
-Conflicts=shutdown.target
 Description=Avahi mDNS/DNS-SD Stack Activation Socket
 
 [Socket]

diff --git a/avahi-dnsconfd/avahi-dnsconfd.service.in b/avahi-dnsconfd/avahi-dnsconfd.service.in
index 5e45651e00a468d4109ffdead0556e534a61009d..bd12b7ef93bdb3e0abdd4600f486dcde9b6d36fd 100644 (file)
--- a/avahi-dnsconfd/avahi-dnsconfd.service.in
+++ b/avahi-dnsconfd/avahi-dnsconfd.service.in
@@ -16,10 +16,9 @@
 # USA.
 
 [Unit]
-Requires=basic.target avahi-daemon.socket avahi-daemon.service
-After=basic.target syslog.target avahi-daemon.socket
-Conflicts=shutdown.target
 Description=Avahi DNS Configuration Daemon
+Requires=avahi-daemon.socket avahi-daemon.service
+After=syslog.target avahi-daemon.socket
 
 [Service]
 Type=simple