From 7ff838caca6a72186da2b475bbd76c6e072b4cc3 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 23 Apr 2019 08:04:31 +0200 Subject: [PATCH] interfaces: deleting interfaces already disables them #3406 Which in the case of track6 disables the new deconfiguration process. --- src/etc/inc/interfaces.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index e30254995..9c8afc61e 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -2551,7 +2551,7 @@ function interface_track6_configure($interface = 'lan', $lancfg, $linkupevent = { global $config; - if (!is_array($lancfg) || !isset($lancfg['enable']) || empty($lancfg['track6-interface'])) { + if (!is_array($lancfg) || empty($lancfg['track6-interface'])) { return; } @@ -2561,8 +2561,9 @@ function interface_track6_configure($interface = 'lan', $lancfg, $linkupevent = return; } - if ($linkdownevent) { + if ($linkdownevent || !isset($lancfg['enable'])) { switch ($trackcfg['ipaddrv6']) { + /* deconfiguring 6to4 and 6rd is done elsewhere, simply removed addresses */ case 'slaac': case 'dhcp6': interface_dhcpv6_prepare($lancfg['track6-interface'], $trackcfg);