From be795898c0d2fa21e3389b89793dcd45c47f8b9f Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Sat, 29 Nov 2014 01:07:21 -0800 Subject: timesyncd: Support timesyncd.conf.d directories in the usual search paths --- src/timesync/timesyncd-conf.c | 9 +++++---- src/timesync/timesyncd.conf.in | 3 +++ 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/timesync/timesyncd-conf.c b/src/timesync/timesyncd-conf.c index 4c2dcdb62b..be1f4bb151 100644 --- a/src/timesync/timesyncd-conf.c +++ b/src/timesync/timesyncd-conf.c @@ -97,8 +97,9 @@ int config_parse_servers( int manager_parse_config_file(Manager *m) { assert(m); - return config_parse(NULL, "/etc/systemd/timesyncd.conf", NULL, - "Time\0", - config_item_perf_lookup, timesyncd_gperf_lookup, - false, false, true, m); + return config_parse_many("/etc/systemd/timesyncd.conf", + CONF_DIRS_NULSTR("systemd/timesyncd.conf"), + "Time\0", + config_item_perf_lookup, timesyncd_gperf_lookup, + false, m); } diff --git a/src/timesync/timesyncd.conf.in b/src/timesync/timesyncd.conf.in index 674a51dbd7..fc3c6c49cf 100644 --- a/src/timesync/timesyncd.conf.in +++ b/src/timesync/timesyncd.conf.in @@ -5,6 +5,9 @@ # the Free Software Foundation; either version 2.1 of the License, or # (at your option) any later version. # +# You can override the directives in this file by creating files in +# /etc/systemd/timesyncd.conf.d/*.conf. +# # See timesyncd.conf(5) for details [Time] -- cgit v1.2.3-54-g00ecf