summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xetc/rc.initial.setlanip12
1 files changed, 5 insertions, 7 deletions
diff --git a/etc/rc.initial.setlanip b/etc/rc.initial.setlanip
index 0ab10d4..be07a7e 100755
--- a/etc/rc.initial.setlanip
+++ b/etc/rc.initial.setlanip
@@ -397,14 +397,12 @@ function console_configure_dhcpd($version = 4) {
} 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])
+ number - Nov 2014 - is it really? */
+ if($config[$dhcpd][$interface]) {
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 +452,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;
}
}
OpenPOWER on IntegriCloud