fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-06 11:40:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ifcfg-rh: ignore team connections until we support team devices (rh #968268)

Browse source 
https://fedorahosted.org/libteam/
team connections are marked by
DEVICETYPE="Team"
or
DEVICETYPE="TeamPort"
This commit is contained in:
Jiří Klimeš 2013-05-28 16:26:00 +02:00
parent 0477becfae
commit 5875e17769
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/settings/plugins/ifcfg-rh/common.h
View file

@ -47,6 +47,8 @@
#define TYPE_BRIDGE "Bridge"
#define TYPE_BOND "Bond"
#define TYPE_VLAN "Vlan"
#define TYPE_TEAM "Team"
#define TYPE_TEAM_PORT "TeamPort"
#define SECRET_FLAG_AGENT "user"
#define SECRET_FLAG_NOT_SAVED "ask"

22
src/settings/plugins/ifcfg-rh/reader.c
View file

@ -4184,7 +4184,7 @@ connection_from_file (const char *filename,
{
NMConnection *connection = NULL;
shvarFile *parsed;
char *type, *nmc = NULL, *bootproto;
char *type, *devtype, *nmc = NULL, *bootproto;
NMSetting *s_ip4, *s_ip6, *s_port;
const char *ifcfg_name = NULL;
gboolean nm_controlled = TRUE;
@ -4222,6 +4222,26 @@ connection_from_file (const char *filename,
return NULL;
}
/*
* Ignore Team connections for now; we don't support team yet.
* https://fedorahosted.org/libteam/
*/
devtype = svGetValue (parsed, "DEVICETYPE", FALSE);
if (devtype) {
if ( !strcasecmp (devtype, TYPE_TEAM)
|| !strcasecmp (devtype, TYPE_TEAM_PORT)) {
char *base_name = g_path_get_basename (filename);
g_set_error (&error, IFCFG_PLUGIN_ERROR, 0,
"Ignoring team (DEVICETYPE=\"%s\") connection '%s'; teaming is not supported yet",
devtype,
base_name);
g_free (base_name);
g_free (devtype);
goto done;
}
g_free (devtype);
}
type = svGetValue (parsed, "TYPE", FALSE);
if (!type) {
char *device;