summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorsmos <seth.mos@dds.nl>2012-06-08 21:24:11 +0200
committersmos <seth.mos@dds.nl>2012-06-08 21:24:11 +0200
commit25d1c6b206de01ffa4778f6314cd8068f9190c14 (patch)
tree4f583c8a28ff9ca5dd2c07de4d4896889e99cd39 /etc
parent48a5985ce997a2a28fef8226e9a492b325270697 (diff)
downloadpfsense-25d1c6b206de01ffa4778f6314cd8068f9190c14.zip
pfsense-25d1c6b206de01ffa4778f6314cd8068f9190c14.tar.gz
Shorter version of the fix to always set the radvd interface.
Redmine ticket #2477
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/services.inc6
1 files changed, 2 insertions, 4 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index 581f15b..6987a23 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -86,6 +86,8 @@ function services_radvd_configure() {
if(!isset($dhcpv6ifconf['rapriority']))
$dhcpv6ifconf['rapriority'] = "medium";
+ /* always start with the real parent, we override with the carp if later */
+ $realif = get_real_interface($dhcpv6if);
$carpif = false;
/* check if we need to listen on a CARP interface */
$carplist = get_configured_carp_interface_list();
@@ -93,11 +95,7 @@ function services_radvd_configure() {
if($carplist[$dhcpv6ifconf['rainterface']] <> "") {
$realif = $dhcpv6ifconf['rainterface'];
$carpif = true;
- } else {
- $realif = get_real_interface($dhcpv6if);
}
- } else {
- $realif = get_real_interface($dhcpv6if);
}
$ifcfgipv6 = get_interface_ipv6($dhcpv6if);
OpenPOWER on IntegriCloud