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

interfaces: revert useless commits

Browse Source 
This reverts commit e6dc3265fe76d00aaf250cc7bf5515c1e3d922d4.
This reverts commit e211d1ab2702be8df65e8d1cce1e4589ccd37f5a.
This commit is contained in:
Franco Fichtner 2018-03-11 14:34:16 +00:00
parent 1a22b8822a
commit 60b3db278f
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3210,10 +3210,9 @@ function interface_dhcpv6_configure($interface = 'wan', $wancfg)
$rtsoldscript .= "\techo \${2} > /tmp/{$wanif}_routerv6\n";
$rtsoldscript .= "\techo \${2} > /tmp/{$wanif}_defaultgwv6\n";
$rtsoldscript .= "fi\n";
$rtsoldscript .= "PID=$(cat /var/run/dhcp6c_{$wanif}.pid)\n";
$rtsoldscript .= "if [ -n \"\${PID}\" ]; then\n";
$rtsoldscript .= "\t/bin/kill \${PID}\n";
$rtsoldscript .= "\t/bin/pwait \${PID}\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/sleep 1\n";
$rtsoldscript .= "fi\n";
$rtsoldscript .= "/usr/bin/logger -t rtsold \"Starting dhcp6 client for interface {$interface}({$wanif})\"\n";
$rtsoldscript .= "$dhcp6ccommand\n";

2
src/www/interfaces.php
View File

@ -1267,7 +1267,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
if (!empty($old_config['ipaddrv6']) && $old_config['ipaddrv6'] == 'dhcp6' && $new_config['ipaddrv6'] != 'dhcp6') {
// change from dhcp to something else, kill dhcp6c
killbypid("/var/run/dhcp6c_{$old_config['if']}.pid", 'TERM', true);
killbypid("/var/run/dhcp6c_{$old_config['if']}.pid");
}
// save to config