From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 22 Jul 2019 12:47:51 +0000 (+0200)
Subject: timesyncd: add ntp-units.d/ entry for timesync
X-Git-Tag: v243-rc1~70^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e5ea741c62f9747417eefd1d197ef6c8eea87047;p=thirdparty%2Fsystemd.git

timesyncd: add ntp-units.d/ entry for timesync

Priority is 80. At least in Fedora, chrony uses 50, and ntpd 60.
timesyncd has lower priority, because if people install those other packages,
it's most likely on purpose. timesyncd is always installed and provides
less functionality.
---

diff --git a/meson.build b/meson.build
index 04a830cdfaa..09abd9e2ec6 100644
--- a/meson.build
+++ b/meson.build
@@ -157,6 +157,7 @@ systemdstatedir = join_paths(localstatedir, 'lib/systemd')
 catalogstatedir = join_paths(systemdstatedir, 'catalog')
 randomseeddir = join_paths(localstatedir, 'lib/systemd')
 profiledir = join_paths(rootlibexecdir, 'portable', 'profile')
+ntpservicelistdir = join_paths(rootprefixdir, 'lib/systemd/ntp-units.d')
 
 docdir = get_option('docdir')
 if docdir == ''
diff --git a/src/timesync/80-systemd-timesync.list b/src/timesync/80-systemd-timesync.list
new file mode 100644
index 00000000000..d5959ade899
--- /dev/null
+++ b/src/timesync/80-systemd-timesync.list
@@ -0,0 +1 @@
+systemd-timesyncd.service
diff --git a/src/timesync/meson.build b/src/timesync/meson.build
index b79ef08277a..e5c118c8db7 100644
--- a/src/timesync/meson.build
+++ b/src/timesync/meson.build
@@ -32,6 +32,8 @@ if conf.get('ENABLE_TIMESYNCD') == 1
                      install_dir : dbuspolicydir)
         install_data('org.freedesktop.timesync1.service',
                      install_dir : dbussystemservicedir)
+        install_data('80-systemd-timesync.list',
+                     install_dir : ntpservicelistdir)
 endif
 
 ############################################################