summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-07-03 23:15:22 +0200
committerLennart Poettering <lennart@poettering.net>2010-07-03 23:19:05 +0200
commita8d8c32699125a2cd9694538f1caa319e2a40ffa (patch)
tree517e649c42b9f42ed66d7c28eedfced5f7ca90c3
parent285dc9efafa671eeaaf184a658553e08655eac61 (diff)
systemd: simplify systemd unit files following the recent DefaultDependencies= changes
-rw-r--r--avahi-daemon/avahi-daemon.service.in5
-rw-r--r--avahi-daemon/avahi-daemon.socket.in3
-rw-r--r--avahi-dnsconfd/avahi-dnsconfd.service.in5
3 files changed, 4 insertions, 9 deletions
diff --git a/avahi-daemon/avahi-daemon.service.in b/avahi-daemon/avahi-daemon.service.in
index e9b81d6..a88d69e 100644
--- 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 90f7d36..13309b8 100644
--- 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 5e45651..bd12b7e 100644
--- 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