Attachment 664934 Details for Bug 830434 – [PATCH] ifcfg-rh: treat missing IPv6 setting as Auto when writing ifcfg file

[patch] [PATCH] ifcfg-rh: treat missing IPv6 setting as Auto when writing ifcfg file

0001-ifcfg-rh-treat-missing-IPv6-setting-as-IPv6-Auto-met.patch (text/plain), 1.86 KB, created by Jirka Klimes on 2012-12-17 15:36:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jirka Klimes

Created: 2012-12-17 15:36:38 UTC

Size: 1.86 KB

patch

obsolete

>From 2b2362b1600c048f30d4d02c0526c893c0cd04b3 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <jklimes@redhat.com>
>Date: Mon, 17 Dec 2012 16:33:02 +0100
>Subject: [PATCH] ifcfg-rh: treat missing IPv6 setting as IPv6 Auto method (rh
> #830434)
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>
>Signed-off-by: JiÅÃ KlimeÅ¡ <jklimes@redhat.com>
>---
> src/settings/plugins/ifcfg-rh/writer.c | 17 ++++++++++-------
> 1 file changed, 10 insertions(+), 7 deletions(-)
>
>diff --git a/src/settings/plugins/ifcfg-rh/writer.c b/src/settings/plugins/ifcfg-rh/writer.c
>index f0ee023..2234351 100644
>--- a/src/settings/plugins/ifcfg-rh/writer.c
>+++ b/src/settings/plugins/ifcfg-rh/writer.c
>@@ -1897,9 +1897,14 @@ write_ip6_setting (NMConnection *connection, shvarFile *ifcfg, GError **error)
> 
> 	s_ip6 = nm_connection_get_setting_ip6_config (connection);
> 	if (!s_ip6) {
>-		g_set_error (error, IFCFG_PLUGIN_ERROR, 0,
>-		             "Missing '%s' setting", NM_SETTING_IP6_CONFIG_SETTING_NAME);
>-		return FALSE;
>+		/* Treat missing IPv6 setting as a setting with AUTO */
>+		svSetValue (ifcfg, "IPV6INIT", "yes", FALSE);
>+		svSetValue (ifcfg, "IPV6_AUTOCONF", "yes", FALSE);
>+		svSetValue (ifcfg, "DHCPV6C", NULL, FALSE);
>+		svSetValue (ifcfg, "IPV6_PEERDNS", "yes", FALSE);
>+		svSetValue (ifcfg, "IPV6_PEERROUTES", "yes", FALSE);
>+		svSetValue (ifcfg, "IPV6_DEFROUTE", "yes", FALSE);
>+		return TRUE;
> 	}
> 
> 	value = nm_setting_ip6_config_get_method (s_ip6);
>@@ -2210,10 +2215,8 @@ write_connection (NMConnection *connection,
> 		if (!write_ip4_setting (connection, ifcfg, error))
> 			goto out;
> 
>-		if (nm_connection_get_setting_ip6_config (connection)) {
>-			if (!write_ip6_setting (connection, ifcfg, error))
>-				goto out;
>-		}
>+		if (!write_ip6_setting (connection, ifcfg, error))
>+			goto out;
> 	}
> 
> 	write_connection_setting (s_con, ifcfg);
>-- 
>1.7.11.7
>

Actions: View | Diff

Attachments on bug 830434: 664934 | 665388