1
0
mirror of https://github.com/systemd/systemd.git synced 2024-11-07 01:27:11 +03:00

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

This commit is contained in:
Lennart Poettering 2013-12-12 03:00:57 +01:00
parent d514feaa87
commit fe2b58a4ff
2 changed files with 5 additions and 1 deletions

View File

@ -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",

View File

@ -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