From dcc4ec0a8265107ea4bba34772b3e1f699e9168c Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 6 Aug 2018 07:13:58 +0200
Subject: [PATCH] interfaces: move the dhcpdv6 start up once more

---
 src/etc/inc/interfaces.inc | 11 -----------
 src/etc/rc.newwanipv6      | 13 ++++++++++++-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index 4e0b20772..1efefc3ba 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -3799,19 +3799,8 @@ function link_interface_to_track6($wanif, $update = false)
             services_radvd_configure();
         }
 
-        /* XXX Can you take me higher? To the place where IPv6 works. */
-        $manual_dhcpv6 = false;
-
         foreach ($list as $lanif => $lancfg) {
             interface_track6_configure($lanif, $lancfg);
-
-            if (isset($lancfg['dhcpd6track6allowoverride'])) {
-                $manual_dhcpv6 = true;
-            }
-        }
-
-        if ($manual_dhcpv6) {
-            services_dhcpd_configure('inet6');
         }
     }
 
diff --git a/src/etc/rc.newwanipv6 b/src/etc/rc.newwanipv6
index 65bfe5aea..3629c6a43 100755
--- a/src/etc/rc.newwanipv6
+++ b/src/etc/rc.newwanipv6
@@ -113,7 +113,18 @@ if (!empty($grouptmp)) {
     array_walk($grouptmp, 'interface_group_add_member');
 }
 
-link_interface_to_track6($interface, true);
+$manual_dhcpv6 = false;
+
+foreach (link_interface_to_track6($interface, true) as $lanif => $lancfg) {
+    if (isset($lancfg['dhcpd6track6allowoverride'])) {
+        $manual_dhcpv6 = true;
+    }
+}
+
+if ($manual_dhcpv6) {
+    services_dhcpd_configure('inet6');
+}
+
 system_resolvconf_generate();
 system_hosts_generate();