From 88e262b667df1cd9873c45f0062ae79735f41ae6 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 29 Oct 2013 19:31:41 +0100 Subject: timedate: handle more nicely if something or somebody keeps open /dev/rtc and thus blocks out everybody else chrony is appears to keep the RTC open continuously these days which is a bad idea, and /dev/rtc is a single-user device, which is a bad idea too. Together both bad ideas mean that nobody else can access the RTC anymore. That's something to fix, but in the meantime we should handle this more gracefully. --- src/timedate/timedated.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/timedate/timedated.c') diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c index 809c80bad1..3d450ca3fa 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -467,12 +467,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) -- cgit v1.2.3-54-g00ecf