X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftimedate%2Ftimedated.c;h=0e74c25b05abab13dbceca2979f9027b61caa297;hp=af2b0785cf6bafa026c3d55530ad74591fee57ca;hb=609896125cb89cac2fcd5b80b532de97d7a64c0a;hpb=cde93897cdefdd7c7f66c400a61e42ceee5f6a46 diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c index af2b0785c..0e74c25b0 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -31,7 +31,7 @@ #include "util.h" #include "strv.h" #include "def.h" -#include "hwclock.h" +#include "clock-util.h" #include "conf-files.h" #include "path-util.h" #include "fileio-label.h" @@ -126,7 +126,7 @@ static int context_read_data(Context *c) { r = readlink_malloc("/etc/localtime", &t); if (r < 0) { if (r == -EINVAL) - log_warning("/etc/localtime should be a symbolic link to a timezone data file in /usr/share/zoneinfo/."); + log_warning("/etc/localtime should be a symbolic link to a time zone data file in /usr/share/zoneinfo/."); else log_warning("Failed to get target of /etc/localtime: %s", strerror(-r)); } else { @@ -137,7 +137,7 @@ static int context_read_data(Context *c) { e = path_startswith(t, "../usr/share/zoneinfo/"); if (!e) - log_warning("/etc/localtime should be a symbolic link to a timezone data file in /usr/share/zoneinfo/."); + log_warning("/etc/localtime should be a symbolic link to a time zone data file in /usr/share/zoneinfo/."); else { c->zone = strdup(e); if (!c->zone) @@ -153,7 +153,7 @@ have_timezone: c->zone = NULL; } - c->local_rtc = hwclock_is_localtime() > 0; + c->local_rtc = clock_is_localtime() > 0; return 0; } @@ -263,9 +263,8 @@ static char** get_ntp_services(void) { char line[PATH_MAX], *l; if (!fgets(line, sizeof(line), f)) { - if (ferror(f)) - log_error("Failed to read NTP units file: %m"); + log_error("Failed to read NTP unit file: %m"); break; } @@ -313,7 +312,7 @@ static int context_read_ntp(Context *c, sd_bus *bus) { *i); if (r < 0) { - /* This implementation does not exist, try next one */ + /* This implementation does not exist. Try the next one. */ if (sd_bus_error_has_name(&error, SD_BUS_ERROR_FILE_NOT_FOUND)) continue; @@ -376,7 +375,7 @@ static int context_start_ntp(Context *c, sd_bus *bus, sd_bus_error *error) { if (sd_bus_error_has_name(error, SD_BUS_ERROR_FILE_NOT_FOUND) || sd_bus_error_has_name(error, "org.freedesktop.systemd1.LoadFailed") || sd_bus_error_has_name(error, "org.freedesktop.systemd1.NoSuchUnit")) { - /* This implementation does not exist, try next one */ + /* This implementation does not exist. Try the next one. */ sd_bus_error_free(error); continue; } @@ -425,7 +424,7 @@ static int context_enable_ntp(Context*c, sd_bus *bus, sd_bus_error *error) { if (r < 0) { if (sd_bus_error_has_name(error, SD_BUS_ERROR_FILE_NOT_FOUND)) { - /* This implementation does not exist, try next one */ + /* This implementation does not exist. Try the next one. */ sd_bus_error_free(error); continue; } @@ -466,10 +465,13 @@ static int property_get_rtc_time( int r; zero(tm); - r = hwclock_get_time(&tm); + r = clock_get_hwclock(&tm); 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."); + log_warning("/dev/rtc is busy. Is somebody keeping it open continuously? That's not a good idea... Returning a bogus RTC timestamp."); t = 0; + } else if (r == -ENOENT) { + log_debug("/dev/rtc not 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 @@ -539,12 +541,12 @@ static int method_set_timezone(sd_bus *bus, sd_bus_message *m, void *userdata, s /* 1. Write new configuration file */ r = context_write_data_timezone(c); if (r < 0) { - log_error("Failed to set timezone: %s", strerror(-r)); - return sd_bus_error_set_errnof(error, r, "Failed to set timezone: %s", strerror(-r)); + log_error("Failed to set time zone: %s", strerror(-r)); + return sd_bus_error_set_errnof(error, r, "Failed to set time zone: %s", strerror(-r)); } /* 2. Tell the kernel our timezone */ - hwclock_set_timezone(NULL); + clock_set_timezone(NULL); if (c->local_rtc) { struct timespec ts; @@ -553,13 +555,13 @@ static int method_set_timezone(sd_bus *bus, sd_bus_message *m, void *userdata, s /* 3. Sync RTC from system clock, with the new delta */ assert_se(clock_gettime(CLOCK_REALTIME, &ts) == 0); assert_se(tm = localtime(&ts.tv_sec)); - hwclock_set_time(tm); + clock_set_hwclock(tm); } log_struct(LOG_INFO, MESSAGE_ID(SD_MESSAGE_TIMEZONE_CHANGE), "TIMEZONE=%s", c->zone, - "MESSAGE=Changed timezone to '%s'.", c->zone, + "MESSAGE=Changed time zone to '%s'.", c->zone, NULL); sd_bus_emit_properties_changed(bus, "/org/freedesktop/timedate1", "org.freedesktop.timedate1", "Timezone", NULL); @@ -600,7 +602,7 @@ static int method_set_local_rtc(sd_bus *bus, sd_bus_message *m, void *userdata, } /* 2. Tell the kernel our timezone */ - hwclock_set_timezone(NULL); + clock_set_timezone(NULL); /* 3. Synchronize clocks */ assert_se(clock_gettime(CLOCK_REALTIME, &ts) == 0); @@ -619,7 +621,7 @@ static int method_set_local_rtc(sd_bus *bus, sd_bus_message *m, void *userdata, /* Override the main fields of * struct tm, but not the timezone * fields */ - if (hwclock_get_time(&tm) >= 0) { + if (clock_get_hwclock(&tm) >= 0) { /* And set the system clock * with this */ @@ -640,7 +642,7 @@ static int method_set_local_rtc(sd_bus *bus, sd_bus_message *m, void *userdata, else tm = gmtime(&ts.tv_sec); - hwclock_set_time(tm); + clock_set_hwclock(tm); } log_info("RTC configured to %s time.", c->local_rtc ? "local" : "UTC"); @@ -703,12 +705,11 @@ static int method_set_time(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bu tm = localtime(&ts.tv_sec); else tm = gmtime(&ts.tv_sec); - - hwclock_set_time(tm); + clock_set_hwclock(tm); log_struct(LOG_INFO, MESSAGE_ID(SD_MESSAGE_TIME_CHANGE), - "REALTIME=%llu", (unsigned long long) timespec_load(&ts), + "REALTIME="USEC_FMT, timespec_load(&ts), "MESSAGE=Changed local time to %s", ctime(&ts.tv_sec), NULL); @@ -782,13 +783,13 @@ static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) { return r; } - r = sd_bus_add_object_vtable(bus, "/org/freedesktop/timedate1", "org.freedesktop.timedate1", timedate_vtable, c); + r = sd_bus_add_object_vtable(bus, NULL, "/org/freedesktop/timedate1", "org.freedesktop.timedate1", timedate_vtable, c); if (r < 0) { log_error("Failed to register object: %s", strerror(-r)); return r; } - r = sd_bus_request_name(bus, "org.freedesktop.timedate1", SD_BUS_NAME_REPLACE_EXISTING|SD_BUS_NAME_DO_NOT_QUEUE); + r = sd_bus_request_name(bus, "org.freedesktop.timedate1", 0); if (r < 0) { log_error("Failed to register name: %s", strerror(-r)); return r; @@ -844,7 +845,7 @@ int main(int argc, char *argv[]) { r = context_read_data(&context); if (r < 0) { - log_error("Failed to read timezone data: %s", strerror(-r)); + log_error("Failed to read time zone data: %s", strerror(-r)); goto finish; } @@ -854,14 +855,12 @@ int main(int argc, char *argv[]) { goto finish; } - r = bus_event_loop_with_idle(event, bus, "org.freedesktop.timedate1", DEFAULT_EXIT_USEC); + r = bus_event_loop_with_idle(event, bus, "org.freedesktop.timedate1", DEFAULT_EXIT_USEC, NULL, NULL); if (r < 0) { log_error("Failed to run event loop: %s", strerror(-r)); goto finish; } - r = 0; - finish: context_free(&context, bus);