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

interfaces: no spurious redirection for dhclient; #2372

Browse Source
This commit is contained in:
Franco Fichtner 2018-04-23 18:14:23 +02:00
parent f9acc51bb7
commit 200f92b755
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3281,9 +3281,9 @@ function interface_dhcp_configure($interface = 'wan')
global $config;
$wancfg = $config['interfaces'][$interface];
$wanif = $wancfg['if'];
if (empty($wancfg)) {
$wancfg = array();
log_error("Interface {$interface} does not have a DHCP configuration.");
return;
}
/* generate dhclient_wan.conf */
@ -3361,17 +3361,13 @@ EOD;
fclose($fd);
/* bring wan interface up before starting dhclient */
if ($wanif) {
interfaces_bring_up($wanif);
} else {
log_error("Could not bring up {$wanif} interface in interface_dhcp_configure()");
}
interfaces_bring_up($wanif);
/* Make sure dhclient is not running */
kill_dhclient_process($wanif);
/* fire up dhclient */
mwexec("/sbin/dhclient -c /var/etc/dhclient_{$interface}.conf {$wanif} > /tmp/{$wanif}_output 2> /tmp/{$wanif}_error_output");
mwexecf('/sbin/dhclient -c %s %s', array("/var/etc/dhclient_{$interface}.conf", $wanif));
}
function DHCP_Config_File_Advanced($interface, $wancfg, $wanif)