[ntp] update systemd-timedated integration (#846077)

Miroslav Lichvar mlichvar at fedoraproject.org
Tue Aug 7 19:56:15 UTC 2012


commit a1215d1393550a86f06ad45a397e883bb3852aef
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date:   Tue Aug 7 20:11:25 2012 +0200

    update systemd-timedated integration (#846077)

 ntp.spec     |    6 +++---
 ntpd.service |    1 -
 2 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/ntp.spec b/ntp.spec
index b8a5454..a600b4f 100644
--- a/ntp.spec
+++ b/ntp.spec
@@ -258,8 +258,8 @@ install -p -m644 %{SOURCE12} ./lib/systemd/system/ntpd.service
 install -p -m644 %{SOURCE13} ./lib/systemd/system/ntpdate.service
 install -p -m644 %{SOURCE14} ./lib/systemd/system/ntp-wait.service
 
-mkdir ./lib/systemd/system/systemd-timedated-ntp.target.wants
-ln -sf ../ntpd.service ./lib/systemd/system/systemd-timedated-ntp.target.wants
+mkdir ./lib/systemd/ntp-units.d
+echo 'ntpd.service' > ./lib/systemd/ntp-units.d/60-ntpd.list
 
 popd
 
@@ -340,8 +340,8 @@ fi
 %{_mandir}/man8/ntptime.8*
 %{_mandir}/man8/sntp.8*
 %{_mandir}/man8/tickadj.8*
+/lib/systemd/ntp-units.d
 /lib/systemd/system/ntpd.service
-/lib/systemd/system/systemd-timedated-ntp.target.wants
 
 %files perl
 %defattr(-,root,root)
diff --git a/ntpd.service b/ntpd.service
index 064fc05..a5766e5 100644
--- a/ntpd.service
+++ b/ntpd.service
@@ -1,7 +1,6 @@
 [Unit]
 Description=Network Time Service
 After=syslog.target ntpdate.service
-BindTo=systemd-timedated-ntp.target
 
 [Service]
 Type=forking


More information about the scm-commits mailing list