From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 17 Jun 2014 00:18:33 +0000 (+0200)
Subject: units: minor cleanups
X-Git-Tag: v215~377
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=689d781b87164bc89554e2fecdf6fbb5725c0804;p=platform%2Fupstream%2Fsystemd.git

units: minor cleanups
---

diff --git a/units/systemd-networkd.service.in b/units/systemd-networkd.service.in
index 8b0ea14..f33c65e 100644
--- a/units/systemd-networkd.service.in
+++ b/units/systemd-networkd.service.in
@@ -8,11 +8,12 @@
 [Unit]
 Description=Network Service
 Documentation=man:systemd-networkd.service(8)
+ConditionCapability=CAP_NET_ADMIN
 DefaultDependencies=no
 After=dbus.service network-pre.target systemd-sysusers.service
-Before=network.target
+Before=network.target multi-user.target shutdown.target
+Conflicts=shutdown.target
 Wants=network.target
-ConditionCapability=CAP_NET_ADMIN
 
 [Service]
 Type=notify
diff --git a/units/systemd-timesyncd.service.in b/units/systemd-timesyncd.service.in
index a20621d..17b60d0 100644
--- a/units/systemd-timesyncd.service.in
+++ b/units/systemd-timesyncd.service.in
@@ -9,13 +9,12 @@
 Description=Network Time Synchronization
 Documentation=man:systemd-timesyncd.service(8)
 ConditionCapability=CAP_SYS_TIME
-DefaultDependencies=off
+DefaultDependencies=no
 RequiresMountsFor=/var/lib/systemd/clock
 After=systemd-remount-fs.service systemd-tmpfiles-setup.service systemd-sysusers.service
-Before=sysinit.target shutdown.target
+Before=time-sync.target sysinit.target shutdown.target
 Conflicts=shutdown.target
 Wants=time-sync.target
-Before=time-sync.target
 
 [Service]
 Type=notify