fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 00:38:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge: branch 'ff/nmcli_editor_wol'

Browse source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1036
This commit is contained in:
Fernando Fernández Mancera 2021-12-01 11:51:18 +00:00
commit 249ab3a5cd
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/nmcli/connections.c
View file

@ -6726,6 +6726,7 @@ typedef enum {
NMC_EDITOR_MAIN_CMD_HELP,
NMC_EDITOR_MAIN_CMD_NMCLI,
NMC_EDITOR_MAIN_CMD_QUIT,
NMC_EDITOR_MAIN_CMD_ADD,
} NmcEditorMainCmd;
static void
@ -6776,6 +6777,8 @@ parse_editor_main_cmd(const char *cmd, char **cmd_arg)
editor_cmd = NMC_EDITOR_MAIN_CMD_REMOVE;
else if (matches(cmd_arg0, "set"))
editor_cmd = NMC_EDITOR_MAIN_CMD_SET;
else if (matches(cmd_arg0, "add"))
editor_cmd = NMC_EDITOR_MAIN_CMD_ADD;
else if (matches(cmd_arg0, "describe"))
editor_cmd = NMC_EDITOR_MAIN_CMD_DESCRIBE;
else if (matches(cmd_arg0, "print"))
@ -6857,6 +6860,11 @@ editor_main_help(const char *command)
"This command sets property value.\n\n"
"Example: nmcli> set con.id My connection\n"));
break;
case NMC_EDITOR_MAIN_CMD_ADD:
g_print(_("add [<setting>.<prop> <value>] :: add property value\n\n"
"This command appends property value.\n\n"
"Example: nmcli> add ipv4.addresses 192.168.1.1/24\n"));
break;
case NMC_EDITOR_MAIN_CMD_DESCRIBE:
g_print(_("describe [<setting>.<prop>] :: describe property\n\n"
"Shows property description. You can consult nm-settings(5) "
@ -7727,6 +7735,7 @@ editor_menu_main(NmCli *nmc, NMConnection *connection, const char *connection_ty
split_editor_main_cmd_args(cmd_arg, &cmd_arg_s, &cmd_arg_p, &cmd_arg_v);
switch (cmd) {
case NMC_EDITOR_MAIN_CMD_ADD:
case NMC_EDITOR_MAIN_CMD_SET:
/* Set property value */
if (!cmd_arg) {
@ -7996,8 +8005,9 @@ editor_menu_main(NmCli *nmc, NMConnection *connection, const char *connection_ty
if (!nmc_setting_set_property(nmc->client,
ss,
prop_name,
NM_META_ACCESSOR_MODIFIER_SET,
NULL,
cmd_arg_v ? NM_META_ACCESSOR_MODIFIER_DEL
: NM_META_ACCESSOR_MODIFIER_SET,
cmd_arg_v ? cmd_arg_v : NULL,
&tmp_err)) {
g_print(_("Error: failed to remove value of '%s': %s\n"),
prop_name,