shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-21 02:50:18 +03:00
Code

timedated: convert to the new scheme and add --bus-introspect

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-04-23 12:14:09 +02:00
parent cd7e1e1a7f
commit c4b7d95c46
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/timedate/timedated.c
View File

@ -14,6 +14,7 @@
#include "bus-error.h"
#include "bus-log-control-api.h"
#include "bus-polkit.h"
#include "bus-util.h"
#include "clock-util.h"
#include "conf-files.h"
#include "def.h"
@ -1086,6 +1087,12 @@ static const sd_bus_vtable timedate_vtable[] = {
SD_BUS_VTABLE_END,
};
const BusObjectImplementation manager_object = {
"/org/freedesktop/timedate1",
"org.freedesktop.timedate1",
.vtables = BUS_VTABLES(timedate_vtable),
};
static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) {
_cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
int r;
@ -1098,9 +1105,9 @@ static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) {
if (r < 0)
return log_error_errno(r, "Failed to get system bus connection: %m");
r = sd_bus_add_object_vtable(bus, NULL, "/org/freedesktop/timedate1", "org.freedesktop.timedate1", timedate_vtable, c);
r = bus_add_implementation(bus, &manager_object, c);
if (r < 0)
return log_error_errno(r, "Failed to register object: %m");
return r;
r = bus_log_control_api_register(bus);
if (r < 0)
@ -1129,7 +1136,8 @@ static int run(int argc, char *argv[]) {
r = service_parse_argv("systemd-timedated.service",
"Manage the system clock and timezone and NTP enablement.",
NULL,
BUS_IMPLEMENTATIONS(&manager_object,
&log_control_object),
argc, argv);
if (r <= 0)
return r;