timedatectl: port to sd-bus

[elogind.git] / src / timedate / timedated.c

diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index 809c80bad11297acc1fdd6342f79d05f542fef97..9858f5694c79a329c9a921daceebd7d88f710744 100644 (file)
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -248,6 +248,9 @@ static char** get_ntp_services(void) {
                             "/run/systemd/ntp-units.d",
                             "/usr/local/lib/systemd/ntp-units.d",
                             "/usr/lib/systemd/ntp-units.d",
+#ifdef HAVE_SPLIT_USR
+                            "/lib/systemd/ntp-units.d",
+#endif
                             NULL);
         if (k < 0)
                 return NULL;
@@ -467,12 +470,14 @@ static int property_get_rtc_time(
 
         zero(tm);
         r = hwclock_get_time(&tm);
-        if (r < 0) {
+        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 < 0) {
                 sd_bus_error_set_errnof(error, -r, "Failed to read RTC: %s", strerror(-r));
                 return r;
-        }
-
-        t = (usec_t) mktime(&tm) * USEC_PER_SEC;
+        } else
+                t = (usec_t) mktime(&tm) * USEC_PER_SEC;
 
         r = sd_bus_message_append(reply, "t", t);
         if (r < 0)