[systemd-commits] 3 commits - TODO src/timedate units/systemd-ask-password-console.service.in

[Lennart Poettering]

 TODO                                          |    3 +++
 src/timedate/timedated.c                      |   20 ++++++++++++++++++++
 units/systemd-ask-password-console.service.in |    2 +-
 3 files changed, 24 insertions(+), 1 deletion(-)

New commits:
commit 61a9648f022049ac14c5667958752e8dcff857c1
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Mar 6 15:39:27 2013 +0100

    update TODO

diff --git a/TODO b/TODO
index 5ff5707..42c5361 100644
--- a/TODO
+++ b/TODO
@@ -43,6 +43,9 @@ Fedora 19:
 * timer logic is confused by units which are skipped due to failing condition
   http://lists.freedesktop.org/archives/systemd-devel/2013-February/008816.html
 
+* timer logic is also confused if a service it triggers hasn't finished when the next timer elapses:
+  http://lists.freedesktop.org/archives/systemd-devel/2013-February/009021.html
+
 Features:
 
 * neither pkexec nor sudo initialize environ[] from the PAM environment?

commit 6ffe5e37c47c85f91bf6cc56bc3ff3cf60bffd15
Author: Ryan Lortie <desrt at desrt.ca>
Date:   Mon Mar 4 16:35:02 2013 -0500

    timedated: add CanNTP property
    
    If we can't successfully query any ntpd units, set CanNTP to false.
    
    GNOME wants to use this to grey out the NTP switch in the UI.
    
    https://bugs.freedesktop.org/show_bug.cgi?id=61816

diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index 80c24eb..7753493 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -45,6 +45,7 @@
         " <interface name=\"org.freedesktop.timedate1\">\n"             \
         "  <property name=\"Timezone\" type=\"s\" access=\"read\"/>\n"  \
         "  <property name=\"LocalRTC\" type=\"b\" access=\"read\"/>\n"  \
+        "  <property name=\"CanNTP\" type=\"b\" access=\"read\"/>\n"    \
         "  <property name=\"NTP\" type=\"b\" access=\"read\"/>\n"       \
         "  <method name=\"SetTime\">\n"                                 \
         "   <arg name=\"usec_utc\" type=\"x\" direction=\"in\"/>\n"     \
@@ -84,10 +85,12 @@ const char timedate_interface[] _introspect_("timedate1") = INTERFACE;
 typedef struct TZ {
         char *zone;
         bool local_rtc;
+        int can_ntp;
         int use_ntp;
 } TZ;
 
 static TZ tz = {
+        .can_ntp = -1,
         .use_ntp = -1,
 };
 
@@ -387,6 +390,7 @@ static int read_ntp(DBusConnection *bus) {
                         goto finish;
                 }
 
+                tz.can_ntp = 1;
                 tz.use_ntp =
                         streq(s, "enabled") ||
                         streq(s, "enabled-runtime");
@@ -395,6 +399,7 @@ static int read_ntp(DBusConnection *bus) {
         }
 
         /* NTP is not installed. */
+        tz.can_ntp = 0;
         tz.use_ntp = 0;
         r = 0;
 
@@ -588,6 +593,20 @@ finish:
         return r;
 }
 
+static int property_append_can_ntp(DBusMessageIter *i, const char *property, void *data) {
+        dbus_bool_t db;
+
+        assert(i);
+        assert(property);
+
+        db = tz.can_ntp > 0;
+
+        if (!dbus_message_iter_append_basic(i, DBUS_TYPE_BOOLEAN, &db))
+                return -ENOMEM;
+
+        return 0;
+}
+
 static int property_append_ntp(DBusMessageIter *i, const char *property, void *data) {
         dbus_bool_t db;
 
@@ -605,6 +624,7 @@ static int property_append_ntp(DBusMessageIter *i, const char *property, void *d
 static const BusProperty bus_timedate_properties[] = {
         { "Timezone", bus_property_append_string, "s", offsetof(TZ, zone),     true },
         { "LocalRTC", bus_property_append_bool,   "b", offsetof(TZ, local_rtc) },
+        { "CanNTP",   property_append_can_ntp,    "b", offsetof(TZ, can_ntp)   },
         { "NTP",      property_append_ntp,        "b", offsetof(TZ, use_ntp)   },
         { NULL, }
 };

commit da61d6b2f20767a6a4116aac4bbf11281cd3b290
Author: Harald Hoyer <harald at redhat.com>
Date:   Thu Feb 14 12:52:24 2013 +0100

    units: run systemd-ask-password-console.service after systemd-vconsole-setup.service

diff --git a/units/systemd-ask-password-console.service.in b/units/systemd-ask-password-console.service.in
index 4bcb30b..a24fa51 100644
--- a/units/systemd-ask-password-console.service.in
+++ b/units/systemd-ask-password-console.service.in
@@ -10,7 +10,7 @@ Description=Dispatch Password Requests to Console
 Documentation=man:systemd-ask-password-console.service(8)
 DefaultDependencies=no
 Conflicts=shutdown.target
-After=plymouth-start.service
+After=plymouth-start.service systemd-vconsole-setup.service
 Before=shutdown.target
 ConditionPathExists=!/run/plymouth/pid