[systemd-commits] 2 commits - src/core src/libsystemd-bus src/timedate

[Lennart Poettering]

 src/core/service.c            |    2 +-
 src/libsystemd-bus/bus-util.c |    3 ++-
 src/timedate/timedated.c      |    3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 7596e9e10a433c2104a2616dd8dd429a4243e38a
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Dec 12 03:03:03 2013 +0100

    service: actually leave watchdog enabled in the states where it matters

diff --git a/src/core/service.c b/src/core/service.c
index 4c7603c..67d2008 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -1513,7 +1513,7 @@ static void service_set_state(Service *s, ServiceState state) {
                 service_connection_unref(s);
         }
 
-        if (IN_SET(state, SERVICE_START_POST, SERVICE_RUNNING, SERVICE_RELOAD))
+        if (!IN_SET(state, SERVICE_START_POST, SERVICE_RUNNING, SERVICE_RELOAD))
                 service_stop_watchdog(s);
 
         /* For the inactive states unit_notify() will trim the cgroup,

commit fe2b58a4ff8dc1cdf7081bd071bad8450db51423
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Dec 12 03:00:57 2013 +0100

    timedated: make sure GetAll() succeeds in systems lacking /dev/rtc (such as containers)

diff --git a/src/libsystemd-bus/bus-util.c b/src/libsystemd-bus/bus-util.c
index 0a3f6b8..9a42b05 100644
--- a/src/libsystemd-bus/bus-util.c
+++ b/src/libsystemd-bus/bus-util.c
@@ -931,7 +931,8 @@ int bus_map_all_properties(sd_bus *bus,
         assert(path);
         assert(map);
 
-        r = sd_bus_call_method( bus,
+        r = sd_bus_call_method(
+                        bus,
                         destination,
                         path,
                         "org.freedesktop.DBus.Properties",
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index af2b078..e3421c2 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -470,6 +470,9 @@ static int property_get_rtc_time(
         if (r == -EBUSY) {
                 log_warning("/dev/rtc is busy, is somebody keeping it open continously? That's not a good idea... Returning a bogus RTC timestamp.");
                 t = 0;
+        } else if (r == -ENOENT) {
+                log_debug("Not /dev/rtc found.");
+                t = 0; /* no RTC found */
         } else if (r < 0)
                 return sd_bus_error_set_errnof(error, r, "Failed to read RTC: %s", strerror(-r));
         else