aboutsummaryrefslogtreecommitdiffstats
path: root/sysconfig/network-scripts
diff options
context:
space:
mode:
authorPhil Dibowitz <phil@ipom.com>2016-10-07 16:57:32 +0200
committerLukáš Nykrýn <lnykryn@redhat.com>2016-10-10 14:10:50 +0200
commit28745ca8101b47b8a33213cfc524a4ada742721b (patch)
tree3b99499c3a251c19a6f7a07c5294bff871fa30cf /sysconfig/network-scripts
parent432951de1f7f94317ed8c9c713ee4aa8d40d04c3 (diff)
downloadinitscripts-28745ca8101b47b8a33213cfc524a4ada742721b.tar
initscripts-28745ca8101b47b8a33213cfc524a4ada742721b.tar.gz
initscripts-28745ca8101b47b8a33213cfc524a4ada742721b.tar.bz2
initscripts-28745ca8101b47b8a33213cfc524a4ada742721b.tar.xz
initscripts-28745ca8101b47b8a33213cfc524a4ada742721b.zip
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.
Diffstat (limited to 'sysconfig/network-scripts')
-rwxr-xr-xsysconfig/network-scripts/ifup-ipv64
1 files changed, 3 insertions, 1 deletions
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