picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

timedatectl: add 'ntp-servers' and 'revert' commands to modify link NTP servers

Browse source
This commit is contained in:
Yu Watanabe 2019-05-28 12:07:47 +09:00
parent 65856bf208
commit 159a855b34
2 changed files with 117 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
man/timedatectl.xml
View file

@ -227,6 +227,20 @@
<para>By default, empty properties are suppressed. Use <option>--all</option> to show those too.
To select specific properties to show, use <option>--property=</option>.</para></listitem>
</varlistentry>
<varlistentry>
<term><command>ntp-servers <replaceable>INTERFACE</replaceable> <replaceable>SERVER</replaceable>…</command></term>
<listitem><para>Set the interface specific NTP servers. This command can be used only when the
interface is managed by <command>systemd-networkd</command>.</para></listitem>
</varlistentry>
<varlistentry>
<term><command>revert <replaceable>INTERFACE</replaceable></command></term>
<listitem><para>Revert the interface specific NTP servers. This command can be used only when
the interface is managed by <command>systemd-networkd</command>.</para></listitem>
</varlistentry>
</variablelist>
</refsect2>

103
src/timedate/timedatectl.c
View file

@ -700,6 +700,107 @@ static int show_timesync(int argc, char **argv, void *userdata) {
return 0;
}
static int parse_ifindex_bus(sd_bus *bus, const char *str, int *ret) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
int32_t i;
int r;
assert(bus);
assert(str);
assert(ret);
r = parse_ifindex(str, ret);
if (r >= 0)
return 0;
r = sd_bus_call_method(
bus,
"org.freedesktop.network1",
"/org/freedesktop/network1",
"org.freedesktop.network1.Manager",
"GetLinkByName",
&error,
&reply,
"s", str);
if (r < 0)
return log_error_errno(r, "Failed to get ifindex of interfaces %s: %s", str, bus_error_message(&error, r));
r = sd_bus_message_read(reply, "io", &i, NULL);
if (r < 0)
return bus_log_create_error(r);
*ret = i;
return 0;
}
static int verb_ntp_servers(int argc, char **argv, void *userdata) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *req = NULL;
sd_bus *bus = userdata;
int ifindex, r;
assert(bus);
r = parse_ifindex_bus(bus, argv[1], &ifindex);
if (r < 0)
return r;
polkit_agent_open_if_enabled(arg_transport, arg_ask_password);
r = sd_bus_message_new_method_call(
bus,
&req,
"org.freedesktop.network1",
"/org/freedesktop/network1",
"org.freedesktop.network1.Manager",
"SetLinkNTP");
if (r < 0)
return bus_log_create_error(r);
r = sd_bus_message_append(req, "i", ifindex);
if (r < 0)
return bus_log_create_error(r);
r = sd_bus_message_append_strv(req, argv + 2);
if (r < 0)
return bus_log_create_error(r);
r = sd_bus_call(bus, req, 0, &error, NULL);
if (r < 0)
return log_error_errno(r, "Failed to set NTP servers: %s", bus_error_message(&error, r));
return 0;
}
static int verb_revert(int argc, char **argv, void *userdata) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
sd_bus *bus = userdata;
int ifindex, r;
assert(bus);
r = parse_ifindex_bus(bus, argv[1], &ifindex);
if (r < 0)
return r;
polkit_agent_open_if_enabled(arg_transport, arg_ask_password);
r = sd_bus_call_method(
bus,
"org.freedesktop.network1",
"/org/freedesktop/network1",
"org.freedesktop.network1.Manager",
"RevertLinkNTP",
&error,
NULL,
"i", ifindex);
if (r < 0)
return log_error_errno(r, "Failed to revert interface configuration: %s", bus_error_message(&error, r));
return 0;
}
static int help(void) {
_cleanup_free_ char *link = NULL;
int r;
@ -854,6 +955,8 @@ static int timedatectl_main(sd_bus *bus, int argc, char *argv[]) {
{ "set-ntp", 2, 2, 0, set_ntp },
{ "timesync-status", VERB_ANY, 1, 0, show_timesync_status },
{ "show-timesync", VERB_ANY, 1, 0, show_timesync },
{ "ntp-servers", 3, VERB_ANY, 0, verb_ntp_servers },
{ "revert", 2, 2, 0, verb_revert },
{ "help", VERB_ANY, VERB_ANY, 0, verb_help }, /* Not documented, but supported since it is created. */
{}
};