From 28745ca8101b47b8a33213cfc524a4ada742721b Mon Sep 17 00:00:00 2001
From: Phil Dibowitz <phil@ipom.com>
Date: Fri, 7 Oct 2016 16:57:32 +0200
Subject: Allow someone to keep accept_ra on while using static addresses.

It's reasonable (and common) to assign static addresses while still
wanting to get your default gw from your router. The assumption that not
wanting SLAAC means not wanting RA is flawed, but I don't want to break
backwards compatability, so I'm adding an additional option.
---
 sysconfig/network-scripts/ifup-ipv6 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifup-ipv6 b/sysconfig/network-scripts/ifup-ipv6
index 296fa77e..55f52419 100755
--- a/sysconfig/network-scripts/ifup-ipv6
+++ b/sysconfig/network-scripts/ifup-ipv6
@@ -124,7 +124,9 @@ else
         ipv6_local_accept_ra=1
 	if [ "$IPV6_AUTOCONF" = "no" ]; then
 		ipv6_local_auto=0
-                ipv6_local_accept_ra=0
+    if [ ! "$IPV6_FORCE_ACCEPT_RA" = "yes" ]; then
+      ipv6_local_accept_ra=0
+    fi
 	fi
 fi
 
-- 
cgit v1.2.1