mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1329 from phil-davis/patch-3

Browse Source
This commit is contained in:
Renato Botelho 2014-11-03 15:27:32 -02:00
commit f384d8a5d7
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
etc/rc.initial.setlanip
View File

@ -395,16 +395,11 @@ function console_configure_dhcpd($version = 4) {
$config[$dhcpd][$interface]['range']['from'] = $dhcpstartip;
$config[$dhcpd][$interface]['range']['to'] = $dhcpendip;
} else {
/* TODO - this line is causing a "Fatal error: Cannot unset
string offsets in /etc/rc.initial.setlanip" on below line
number */
if($config[$dhcpd][$interface])
if(isset($config[$dhcpd][$interface]['enable'])) {
unset($config[$dhcpd][$interface]['enable']);
echo "Disabling DHCPD...";
if (!$dry_run) {
services_dhcpd_configure();
printf(gettext("Disabling %s DHCPD..."), $label_IPvX);
$restart_dhcpd = true;
}
echo "Done!\n";
}
}
@ -454,7 +449,7 @@ if(!$config['interfaces']['lan']) {
unset($config['nat']);
if (!$dry_run) {
system("rm /var/dhcpd/var/db/* >/dev/null 2>/dev/null");
services_dhcpd_configure();
$restart_dhcpd = true;
}
}