From a8d8c32699125a2cd9694538f1caa319e2a40ffa Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 3 Jul 2010 23:15:22 +0200
Subject: systemd: simplify systemd unit files following the recent
 DefaultDependencies= changes

---
 avahi-daemon/avahi-daemon.service.in     | 5 ++---
 avahi-daemon/avahi-daemon.socket.in      | 3 ---
 avahi-dnsconfd/avahi-dnsconfd.service.in | 5 ++---
 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
-- 
cgit