timesyncd: Support timesyncd.conf.d directories in the usual search paths
This commit is contained in:
parent
f2dacc96b2
commit
be795898c0
|
@ -1244,11 +1244,16 @@ MANPAGES += \
|
||||||
man/systemd-timesyncd.service.8 \
|
man/systemd-timesyncd.service.8 \
|
||||||
man/timesyncd.conf.5
|
man/timesyncd.conf.5
|
||||||
MANPAGES_ALIAS += \
|
MANPAGES_ALIAS += \
|
||||||
man/systemd-timesyncd.8
|
man/systemd-timesyncd.8 \
|
||||||
|
man/timesyncd.conf.d.5
|
||||||
man/systemd-timesyncd.8: man/systemd-timesyncd.service.8
|
man/systemd-timesyncd.8: man/systemd-timesyncd.service.8
|
||||||
|
man/timesyncd.conf.d.5: man/timesyncd.conf.5
|
||||||
man/systemd-timesyncd.html: man/systemd-timesyncd.service.html
|
man/systemd-timesyncd.html: man/systemd-timesyncd.service.html
|
||||||
$(html-alias)
|
$(html-alias)
|
||||||
|
|
||||||
|
man/timesyncd.conf.d.html: man/timesyncd.conf.html
|
||||||
|
$(html-alias)
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if ENABLE_VCONSOLE
|
if ENABLE_VCONSOLE
|
||||||
|
|
|
@ -22,7 +22,8 @@
|
||||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<refentry id="timesyncd.conf" conditional='ENABLE_TIMESYNCD'>
|
<refentry id="timesyncd.conf" conditional='ENABLE_TIMESYNCD'
|
||||||
|
xmlns:xi="http://www.w3.org/2001/XInclude">
|
||||||
<refentryinfo>
|
<refentryinfo>
|
||||||
<title>timesyncd.conf</title>
|
<title>timesyncd.conf</title>
|
||||||
<productname>systemd</productname>
|
<productname>systemd</productname>
|
||||||
|
@ -44,24 +45,28 @@
|
||||||
|
|
||||||
<refnamediv>
|
<refnamediv>
|
||||||
<refname>timesyncd.conf</refname>
|
<refname>timesyncd.conf</refname>
|
||||||
<refpurpose>Network Time Synchronization configuration file</refpurpose>
|
<refname>timesyncd.conf.d</refname>
|
||||||
|
<refpurpose>Network Time Synchronization configuration files</refpurpose>
|
||||||
</refnamediv>
|
</refnamediv>
|
||||||
|
|
||||||
<refsynopsisdiv>
|
<refsynopsisdiv>
|
||||||
<para><filename>/etc/systemd/timesyncd.conf</filename></para>
|
<para><filename>/etc/systemd/timesyncd.conf</filename></para>
|
||||||
|
<para><filename>/etc/systemd/timesyncd.conf.d/*.conf</filename></para>
|
||||||
|
<para><filename>/run/systemd/timesyncd.conf.d/*.conf</filename></para>
|
||||||
|
<para><filename>/usr/lib/systemd/timesyncd.conf.d/*.conf</filename></para>
|
||||||
</refsynopsisdiv>
|
</refsynopsisdiv>
|
||||||
|
|
||||||
<refsect1>
|
<refsect1>
|
||||||
<title>Description</title>
|
<title>Description</title>
|
||||||
|
|
||||||
<para>When starting, systemd-timesyncd will read the
|
<para>These configuration files control NTP network time
|
||||||
configuration file
|
|
||||||
<filename>timesyncd.conf</filename>. This
|
|
||||||
configuration file controls NTP network time
|
|
||||||
synchronization.</para>
|
synchronization.</para>
|
||||||
|
|
||||||
</refsect1>
|
</refsect1>
|
||||||
|
|
||||||
|
<xi:include href="standard-conf.xml" xpointer="confd" />
|
||||||
|
<xi:include href="standard-conf.xml" xpointer="conf" />
|
||||||
|
|
||||||
<refsect1>
|
<refsect1>
|
||||||
<title>Options</title>
|
<title>Options</title>
|
||||||
|
|
||||||
|
|
|
@ -97,8 +97,9 @@ int config_parse_servers(
|
||||||
int manager_parse_config_file(Manager *m) {
|
int manager_parse_config_file(Manager *m) {
|
||||||
assert(m);
|
assert(m);
|
||||||
|
|
||||||
return config_parse(NULL, "/etc/systemd/timesyncd.conf", NULL,
|
return config_parse_many("/etc/systemd/timesyncd.conf",
|
||||||
"Time\0",
|
CONF_DIRS_NULSTR("systemd/timesyncd.conf"),
|
||||||
config_item_perf_lookup, timesyncd_gperf_lookup,
|
"Time\0",
|
||||||
false, false, true, m);
|
config_item_perf_lookup, timesyncd_gperf_lookup,
|
||||||
|
false, m);
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,6 +5,9 @@
|
||||||
# the Free Software Foundation; either version 2.1 of the License, or
|
# the Free Software Foundation; either version 2.1 of the License, or
|
||||||
# (at your option) any later version.
|
# (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
|
# See timesyncd.conf(5) for details
|
||||||
|
|
||||||
[Time]
|
[Time]
|
||||||
|
|
Loading…
Reference in a new issue