picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

timedatectl: avoid specifically referring to NTP 

systemd-timesyncd not only does NTP, but also manages clock monotonicity
using a flags file. In future, it might learn PTP support. Hence don't
expose its enablement state as "NTP" but use the more generic term
"network time synchronization". After all, for similar reasons
systemd-timesyncd is not called systemd-ntpd.
This commit is contained in:
Lennart Poettering 2015-04-07 16:43:37 +02:00
parent 57506e7d18
commit 2fc4f5bd92
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
man/timedatectl.xml
View File

@ -104,10 +104,13 @@
<term><command>status</command></term>
<listitem><para>Show current settings of the system clock and
RTC, including whether NTP is enabled. Note that the NTP state
RTC, including whether network time synchronization is
enabled. Note that the network time synchronization state
simply reflects whether the
<filename>systemd-timesyncd.service</filename> unit is
enabled.</para></listitem>
enabled. Even if the status is shown as off with this command
another service might still synchronize the network over the
network.</para></listitem>
</varlistentry>
<varlistentry>
@ -162,11 +165,13 @@
<varlistentry>
<term><command>set-ntp [BOOL]</command></term>
<listitem><para>Takes a boolean argument. Controls whether NTP
based network time synchronization is enabled (if
available). This enables or disables the
<filename>systemd-timesyncd.service</filename>
unit.</para></listitem>
<listitem><para>Takes a boolean argument. Controls whether
network time synchronous is enabled (if available). This
enables or disables the
<filename>systemd-timesyncd.service</filename> unit. Note that
even if time synchronization is turned off with this command
another system service might still synchronize the clock with
the network.</para></listitem>
</varlistentry>
</variablelist>

4
src/timedate/timedatectl.c
View File

@ -136,7 +136,7 @@ static void print_status_info(const StatusInfo *i) {
tzset();
printf(" Time zone: %s (%.*s)\n"
" NTP enabled: %s\n"
" Network Time on: %s\n"
"NTP synchronized: %s\n"
" RTC in local TZ: %s\n",
strna(i->timezone), (int) sizeof(a), have_time ? a : "n/a",
@ -331,7 +331,7 @@ static void help(void) {
" set-timezone ZONE Set system time zone\n"
" list-timezones Show known time zones\n"
" set-local-rtc BOOL Control whether RTC is in local time\n"
" set-ntp BOOL Control whether NTP is enabled\n",
" set-ntp BOOL Control whether network time synchronization is enabled\n",
program_invocation_short_name);
}