From bfe0ff4216219ca1332d05d60736e21c3421cb47 Mon Sep 17 00:00:00 2001
From: Ossi Herrala <ossi.herrala@codenomicon.com>
Date: Wed, 30 Sep 2015 07:18:07 +0000
Subject: [PATCH] network: Disable IPv6 zeroconf in CentOS/RHEL when IPv6
 address is specified

---
 network/templates/ifcfg-if.erb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/network/templates/ifcfg-if.erb b/network/templates/ifcfg-if.erb
index 5ceb90a..9eebd14 100644
--- a/network/templates/ifcfg-if.erb
+++ b/network/templates/ifcfg-if.erb
@@ -17,11 +17,14 @@ NOZEROCONF=yes
 <% end -%>
 <% if @ip6addr == 'none' -%>
 IPV6INIT=no
+IPV6_AUTOCONF=no
+<% elsif @ip6addr == 'auto' -%>
+IPV6INIT=yes
+IPV6_AUTOCONF=yes
 <% else -%>
 IPV6INIT=yes
-<%   if @ip6addr != 'auto' -%>
+IPV6_AUTOCONF=no
 IPV6ADDR=<%= @ip6addr %>/<%= @ip6netmask %>
-<%   end -%>
 <% end -%>
 <% if @name =~ /br[0-9]/ -%>
 TYPE=Bridge