lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-19 19:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

interfaces: use KILL instead of TERM here

Browse Source 
An experimental change discussed via IRC.
This commit is contained in:
Franco Fichtner 2017-08-16 10:25:53 +02:00
parent 9779e7ac56
commit 83ec429db7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/etc/inc/interfaces.inc
View File

@ -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 {