From fbdfcf758b87b9167e7d7daa5e27bb8f8e1cf6f7 Mon Sep 17 00:00:00 2001
From: marjohn56 <martin@queens-park.com>
Date: Mon, 30 Jul 2018 10:49:20 +0100
Subject: [PATCH] radvd & dhcpd6 configure fix; closes #2586

Safety net to configure dhcpd6 and radvd6
---
 src/etc/inc/interfaces.inc | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index f8559485a..1cb968152 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -2581,15 +2581,12 @@ function interface_track6_configure($interface = 'lan', $lancfg, $linkupevent =
             interface_track6_slaac_configure($interface, $lancfg);
             /* FALLTHROUGH */
         case 'dhcp6':
-            if ($linkupevent == true) {
-                /*
-                 * NOTE: Usually come here from rc.linkup calling so just call directly intead of generating event
-                 *  Instead of disrupting all other v4 configuration just restart DHCPv6 client for now
-                 *
-                 * XXX: Probably DHCPv6 client should handle this autmagically itself?
-                 */
+            if ($linkupevent) {
                 $parentrealif = get_real_interface($lancfg['track6-interface']);
                 killbypid("/var/run/dhcp6c_{$parentrealif}.pid", 'HUP');
+            } else {
+                /* XXX move high-level callback up the call stack */
+                services_dhcpd_configure('inet6');
             }
             break;
     }