Attachment 856618 Details for Bug 1058790 – patch

[patch] patch

0001-ifcfg-rh-write-SLAVE-yes-on-bond-slave-connections.patch (text/plain), 1.88 KB, created by Dan Winship on 2014-01-28 14:27:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Winship

Created: 2014-01-28 14:27:42 UTC

Size: 1.88 KB

patch

obsolete

>From 044297234d0af300d5bfb7207fc22b5653b7afdf Mon Sep 17 00:00:00 2001
>From: Dan Winship <danw@gnome.org>
>Date: Tue, 28 Jan 2014 09:25:59 -0500
>Subject: [PATCH] ifcfg-rh: write SLAVE=yes on bond slave connections
>
>For compatibility with the old network scripts.
>---
> src/settings/plugins/ifcfg-rh/reader.c | 4 ++++
> src/settings/plugins/ifcfg-rh/writer.c | 5 +++--
> 2 files changed, 7 insertions(+), 2 deletions(-)
>
>diff --git a/src/settings/plugins/ifcfg-rh/reader.c b/src/settings/plugins/ifcfg-rh/reader.c
>index 57cfc1b..41055a2 100644
>--- a/src/settings/plugins/ifcfg-rh/reader.c
>+++ b/src/settings/plugins/ifcfg-rh/reader.c
>@@ -1755,6 +1755,10 @@ check_if_bond_slave (shvarFile *ifcfg,
> 		              NULL);
> 		g_free (value);
> 	}
>+
>+	/* We should be checking for SLAVE=yes as well, but NM used to not set that,
>+	 * so for backward-compatibility, we don't check.
>+	 */
> }
> 
> static void
>diff --git a/src/settings/plugins/ifcfg-rh/writer.c b/src/settings/plugins/ifcfg-rh/writer.c
>index 604d492..ec1478f 100644
>--- a/src/settings/plugins/ifcfg-rh/writer.c
>+++ b/src/settings/plugins/ifcfg-rh/writer.c
>@@ -1698,9 +1698,10 @@ write_connection_setting (NMSettingConnection *s_con, shvarFile *ifcfg)
> 
> 	master = nm_setting_connection_get_master (s_con);
> 	if (master) {
>-		if (nm_setting_connection_is_slave_type (s_con, NM_SETTING_BOND_SETTING_NAME))
>+		if (nm_setting_connection_is_slave_type (s_con, NM_SETTING_BOND_SETTING_NAME)) {
> 			svSetValue (ifcfg, "MASTER", master, FALSE);
>-		else if (nm_setting_connection_is_slave_type (s_con, NM_SETTING_BRIDGE_SETTING_NAME))
>+			svSetValue (ifcfg, "SLAVE", "yes", FALSE);
>+		} else if (nm_setting_connection_is_slave_type (s_con, NM_SETTING_BRIDGE_SETTING_NAME))
> 			svSetValue (ifcfg, "BRIDGE", master, FALSE);
> 		else if (nm_setting_connection_is_slave_type (s_con, NM_SETTING_TEAM_SETTING_NAME)) {
> 			svSetValue (ifcfg, "TEAM_MASTER", master, FALSE);
>-- 
>1.8.5.3
>

Actions: View | Diff

Attachments on bug 1058790: 856618