From 83ec429db7965cadae03e38d133829f0e173591b Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 16 Aug 2017 10:25:53 +0200 Subject: [PATCH] interfaces: use KILL instead of TERM here An experimental change discussed via IRC. --- src/etc/inc/interfaces.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index 709dc48c8..ac6250965 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -1206,7 +1206,7 @@ function interface_bring_down($interface = "wan", $ifacecfg = false) switch ($ipaddrv6) { case "slaac": case "dhcp6": - killbypid("/var/run/dhcp6c_{$realif}.pid", 'TERM', true); + killbypid("/var/run/dhcp6c_{$realif}.pid", 'KILL', true); @unlink("/var/etc/dhcp6c_{$interface}.conf"); if (does_interface_exist($realifv6)) { $ip6 = find_interface_ipv6($realifv6); @@ -3223,7 +3223,7 @@ function interface_dhcpv6_configure($interface = 'wan', $wancfg) $rtsoldscript .= "echo $2 > /tmp/{$wanif}_routerv6\n"; $rtsoldscript .= "echo $2 > /tmp/{$wanif}_defaultgwv6\n"; $rtsoldscript .= "if [ -f /var/run/dhcp6c_{$wanif}.pid ]; then\n"; - $rtsoldscript .= "\t/bin/pkill -F /var/run/dhcp6c_{$wanif}.pid\n"; + $rtsoldscript .= "\t/bin/pkill -KILL -F /var/run/dhcp6c_{$wanif}.pid\n"; $rtsoldscript .= "\t/bin/sleep 1\n"; $rtsoldscript .= "fi\n"; $rtsoldscript .= "/usr/bin/logger -t rtsold \"Starting dhcp6 client for interface {$interface}({$wanif})\"\n"; @@ -3250,7 +3250,7 @@ function interface_dhcpv6_configure($interface = 'wan', $wancfg) if (isset($wancfg['dhcp6sendsolicit'])) { /* dhcp6c from previous run can still be around */ - killbypid("/var/run/dhcp6c_{$wanif}.pid", 'TERM', true); + killbypid("/var/run/dhcp6c_{$wanif}.pid", 'KILL', true); /* command is already exec_safe() */ mwexec($dhcp6ccommand); } else {