summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2014-03-24 15:56:01 -0400
committerDan Winship <danw@gnome.org>2014-03-26 10:53:59 -0400
commit12d3a7908e1eff6f4b4b185a165c62fea9a0e86e (patch)
tree6893d94e0e17ebcb8c16a3f9ed62de5cf9b20a6b
parent73e011d0b67a198913e098ba7f5e246aa2dd21bf (diff)
downloadNetworkManager-12d3a7908e1eff6f4b4b185a165c62fea9a0e86e.tar.gz
keyfile: ignore ipv4.address-labels
For now they are only supported by ifcfg-rh
-rw-r--r--src/settings/plugins/keyfile/writer.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/settings/plugins/keyfile/writer.c b/src/settings/plugins/keyfile/writer.c
index 2f8c7cc125..e03ad3d8e7 100644
--- a/src/settings/plugins/keyfile/writer.c
+++ b/src/settings/plugins/keyfile/writer.c
@@ -195,6 +195,17 @@ ip4_addr_writer (GKeyFile *file,
}
static void
+ip4_addr_label_writer (GKeyFile *file,
+ const char *keyfile_dir,
+ const char *uuid,
+ NMSetting *setting,
+ const char *key,
+ const GValue *value)
+{
+ /* skip */
+}
+
+static void
ip4_route_writer (GKeyFile *file,
const char *keyfile_dir,
const char *uuid,
@@ -773,6 +784,9 @@ static KeyWriter key_writers[] = {
{ NM_SETTING_IP4_CONFIG_SETTING_NAME,
NM_SETTING_IP4_CONFIG_ADDRESSES,
ip4_addr_writer },
+ { NM_SETTING_IP4_CONFIG_SETTING_NAME,
+ "address-labels",
+ ip4_addr_label_writer },
{ NM_SETTING_IP6_CONFIG_SETTING_NAME,
NM_SETTING_IP6_CONFIG_ADDRESSES,
ip6_addr_writer },