You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

31 lines
911 B

From fa3efd3ed6d91447d24e6f3f3d6c58180a0c36f0 Mon Sep 17 00:00:00 2001
From: Francesco Giudici <fgiudici@redhat.com>
Date: Fri, 19 Jan 2018 11:52:57 +0100
Subject: [PATCH] libnm-core: ensure alignment of team.config and other team
properties
https://bugzilla.redhat.com/show_bug.cgi?id=1533830
(cherry picked from commit 381c1a19b6d1903ec3d791df8d8a933fd9c306f3)
---
libnm-core/nm-setting-team.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libnm-core/nm-setting-team.c b/libnm-core/nm-setting-team.c
index 01b22d9bd..60bdf5f6b 100644
--- a/libnm-core/nm-setting-team.c
+++ b/libnm-core/nm-setting-team.c
@@ -1485,8 +1485,10 @@ set_property (GObject *object, guint prop_id,
break;
}
- if (align_config)
+ if (align_config) {
_nm_utils_json_append_gvalue (&priv->config, _prop_to_keys[prop_id], align_value);
+ _align_team_properties (setting);
+ }
}
static void
--
2.14.3