diff options
author | Kay Sievers <kay@vrfy.org> | 2014-07-09 14:29:20 +0200 |
---|---|---|
committer | Kay Sievers <kay@vrfy.org> | 2014-07-09 17:04:11 +0200 |
commit | b72ddf0f4f552dd53d6404b6ddbc9f17d02b8e12 (patch) | |
tree | f5eb9c3baab0178f1f3b587de273a40cea5374d5 /Makefile.am | |
parent | efab8d0b0ebf6d715949b7af66fecaf5e5e5d77b (diff) |
timedated: manage systemd-timesyncd directly instead of lists of alternatives
Alternative NTP implementations should add a:
Conflicts=systemd-timesyncd.service
to take over the built-in NTP functionality of systemd.
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index a252693542..5050820d5b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -106,7 +106,6 @@ udevrulesdir=$(udevlibexecdir)/rules.d udevhwdbdir=$(udevlibexecdir)/hwdb.d catalogdir=$(prefix)/lib/systemd/catalog kernelinstalldir = $(prefix)/lib/kernel/install.d -ntpunitsdir=$(prefix)/lib/systemd/ntp-units.d # And these are the special ones for / rootprefix=@rootprefix@ @@ -4320,10 +4319,6 @@ dist_systemunit_DATA += \ polkitpolicy_files += \ src/timedate/org.freedesktop.timedate1.policy -INSTALL_DIRS += \ - $(prefix)/lib/systemd/ntp-units.d \ - $(sysconfdir)/systemd/ntp-units.d - SYSTEM_UNIT_ALIASES += \ systemd-timedated.service dbus-org.freedesktop.timedate1.service @@ -4397,10 +4392,6 @@ EXTRA_DIST += \ CLEANFILES += \ src/timesync/timesyncd.conf - -dist_ntpunits_DATA = \ - src/timesync/90-systemd.list - endif # ------------------------------------------------------------------------------ |