#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"
#include "label.h"
#include "bus-util.h"
+#include "bus-errors.h"
#include "event-util.h"
#define NULL_ADJTIME_UTC "0.0 0 0\n0\nUTC\n"
typedef struct Context {
char *zone;
bool local_rtc;
- unsigned can_ntp;
- unsigned use_ntp;
+ bool can_ntp;
+ bool use_ntp;
Hashmap *polkit_registry;
} Context;
-static void context_reset(Context *c) {
- assert(c);
-
- free(c->zone);
- c->zone = NULL;
-
- c->local_rtc = false;
- c->can_ntp = c->use_ntp = -1;
-}
-
static void context_free(Context *c, sd_bus *bus) {
assert(c);
- context_reset(c);
+ free(c->zone);
bus_verify_polkit_async_registry_free(bus, c->polkit_registry);
}
assert(c);
- context_reset(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 {
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)
c->zone = NULL;
}
- c->local_rtc = hwclock_is_localtime() > 0;
+ c->local_rtc = clock_is_localtime() > 0;
return 0;
}
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;
}
*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;
if (r < 0)
return r;
- c->can_ntp = 1;
- c->use_ntp =
- streq(s, "enabled") ||
- streq(s, "enabled-runtime");
+ c->can_ntp = true;
+ c->use_ntp = STR_IN_SET(s, "enabled", "enabled-runtime");
return 0;
}
- /* NTP is not installed. */
- c->can_ntp = 0;
- c->use_ntp = 0;
-
return 0;
}
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;
}
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;
}
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
/* 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;
/* 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);
}
/* 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);
/* 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 */
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");
assert(m);
assert(c);
+ if (c->use_ntp)
+ return sd_bus_error_setf(error, BUS_ERROR_AUTOMATIC_TIME_SYNC_ENABLED, "Automatic time synchronization is enabled");
+
r = sd_bus_message_read(m, "xbb", &utc, &relative, &interactive);
if (r < 0)
return r;
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);
return sd_bus_reply_method_return(m, NULL);
}
+#include <sys/capability.h>
+
static const sd_bus_vtable timedate_vtable[] = {
SD_BUS_VTABLE_START(0),
SD_BUS_PROPERTY("Timezone", "s", NULL, offsetof(Context, zone), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
- SD_BUS_PROPERTY("LocalRTC", "b", NULL, offsetof(Context, local_rtc), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
- SD_BUS_PROPERTY("CanNTP", "b", bus_property_get_tristate, offsetof(Context, can_ntp), 0),
- SD_BUS_PROPERTY("NTP", "b", bus_property_get_tristate, offsetof(Context, use_ntp), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+ SD_BUS_PROPERTY("LocalRTC", "b", bus_property_get_bool, offsetof(Context, local_rtc), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+ SD_BUS_PROPERTY("CanNTP", "b", bus_property_get_bool, offsetof(Context, can_ntp), 0),
+ SD_BUS_PROPERTY("NTP", "b", bus_property_get_bool, offsetof(Context, use_ntp), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
SD_BUS_PROPERTY("NTPSynchronized", "b", property_get_ntp_sync, 0, 0),
SD_BUS_PROPERTY("TimeUSec", "t", property_get_time, 0, 0),
SD_BUS_PROPERTY("RTCTimeUSec", "t", property_get_rtc_time, 0, 0),
- SD_BUS_METHOD("SetTime", "xbb", NULL, method_set_time, 0),
- SD_BUS_METHOD("SetTimezone", "sb", NULL, method_set_timezone, 0),
- SD_BUS_METHOD("SetLocalRTC", "bbb", NULL, method_set_local_rtc, 0),
- SD_BUS_METHOD("SetNTP", "bb", NULL, method_set_ntp, 0),
+ SD_BUS_METHOD("SetTime", "xbb", NULL, method_set_time, SD_BUS_VTABLE_UNPRIVILEGED),
+ SD_BUS_METHOD("SetTimezone", "sb", NULL, method_set_timezone, SD_BUS_VTABLE_UNPRIVILEGED),
+ SD_BUS_METHOD("SetLocalRTC", "bbb", NULL, method_set_local_rtc, SD_BUS_VTABLE_UNPRIVILEGED),
+ SD_BUS_METHOD("SetNTP", "bb", NULL, method_set_ntp, SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_VTABLE_END,
};
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_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;
}
- if (r != SD_BUS_NAME_PRIMARY_OWNER) {
- log_error("Failed to acquire name.");
- return -EEXIST;
- }
-
r = sd_bus_attach_event(bus, event, 0);
if (r < 0) {
log_error("Failed to attach bus to event loop: %s", strerror(-r));
}
int main(int argc, char *argv[]) {
- Context context = {
- .zone = NULL,
- .local_rtc = false,
- .can_ntp = -1,
- .use_ntp = -1,
- };
-
+ Context context = {};
_cleanup_event_unref_ sd_event *event = NULL;
_cleanup_bus_unref_ sd_bus *bus = NULL;
int r;
goto finish;
}
+ sd_event_set_watchdog(event, true);
+
r = connect_bus(&context, event, &bus);
if (r < 0)
goto finish;
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;
}
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);
~ianmdlvl / elogind.git / blobdiff