[systemd-commits] 2 commits - TODO man/timedatectl.xml src/timedate

[Lennart Poettering]

 TODO                       |    5 +++++
 man/timedatectl.xml        |   19 ++++++++++++-------
 src/timedate/timedatectl.c |    4 ++--
 3 files changed, 19 insertions(+), 9 deletions(-)

New commits:
commit 60d17b74d714fa15d68639062dc2932d7b096229
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Apr 7 16:45:09 2015 +0200

    update TODO

diff --git a/TODO b/TODO
index c69f1f7..928036f 100644
--- a/TODO
+++ b/TODO
@@ -43,6 +43,11 @@ Before 220:
 
 Features:
 
+* add a job mode that will fail if a transaction would mean stopping
+  running units. Use this in timedated to manage the NTP service
+  state.
+  http://lists.freedesktop.org/archives/systemd-devel/2015-April/030229.html
+
 * Maybe add support for the equivalent of "ethtool advertise" to .link files?
   http://lists.freedesktop.org/archives/systemd-devel/2015-April/030112.html
 

commit 2fc4f5bd924b9732afc70f8a6da80573f833fc9d
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Apr 7 16:43:37 2015 +0200

    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.

diff --git a/man/timedatectl.xml b/man/timedatectl.xml
index e5d0ef4..187a7ad 100644
--- a/man/timedatectl.xml
+++ b/man/timedatectl.xml
@@ -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>
diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
index 89913cc..58a92d3 100644
--- a/src/timedate/timedatectl.c
+++ b/src/timedate/timedatectl.c
@@ -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);
 }