From 12d3a7908e1eff6f4b4b185a165c62fea9a0e86e Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@gnome.org>
Date: Mon, 24 Mar 2014 15:56:01 -0400
Subject: [PATCH] keyfile: ignore ipv4.address-labels

For now they are only supported by ifcfg-rh
---
 src/settings/plugins/keyfile/writer.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

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
@@ -194,6 +194,17 @@ ip4_addr_writer (GKeyFile *file,
 		write_ip4_values (file, setting_name, array, FALSE);
 }
 
+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,
@@ -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 },