fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-28 04:50:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: fix setting ethernet.s390-subchannels

Browse source 
It was not properly updated in a7c4d53d03 (when
updating stuff to ne libnm).

And allow 2 subchannels (libnm and ifcfg-rh allow it too).
This commit is contained in:
Jiří Klimeš 2014-11-28 14:11:05 +01:00
parent 313a4081b5
commit 72156ba1c5
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
clients/cli/settings.c
View file

@ -4004,32 +4004,27 @@ DEFINE_REMOVER_INDEX_OR_VALUE (nmc_property_wired_remove_mac_address_blacklist,
static gboolean
nmc_property_wired_set_s390_subchannels (NMSetting *setting, const char *prop, const char *val, GError **error)
{
char **strv = NULL, **iter;
GPtrArray *s390_subchannels;
char **strv = NULL;
int len;
//FIXME: both libnm and ifcfg-rh also allow two strings (3rd is optional)
strv = nmc_strsplit_set (val, " ,\t", 0);
if (g_strv_length (strv) != 3) {
g_set_error (error, 1, 0, _("'%s' is not valid; 3 strings should be provided"),
len = g_strv_length (strv);
if (len != 2 && len != 3) {
g_set_error (error, 1, 0, _("'%s' is not valid; 2 or 3 strings should be provided"),
val);
g_strfreev (strv);
return FALSE;
}
s390_subchannels = g_ptr_array_sized_new (3);
for (iter = strv; iter && *iter; iter++)
g_ptr_array_add (s390_subchannels, *iter);
g_object_set (setting, prop, s390_subchannels, NULL);
g_object_set (setting, prop, strv, NULL);
g_strfreev (strv);
g_ptr_array_free (s390_subchannels, TRUE);
return TRUE;
}
static const char *
nmc_property_wired_describe_s390_subchannels (NMSetting *setting, const char *prop)
{
return _("Enter a list of three channels (comma or space separated).\n\n"
return _("Enter a list of subchannels (comma or space separated).\n\n"
"Example: 0.0.0e20 0.0.0e21 0.0.0e22\n");
}