summaryrefslogtreecommitdiffstats
path: root/etc/inc
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2014-04-28 08:00:01 +0000
committerErmal <eri@pfsense.org>2014-04-28 08:00:01 +0000
commit759a6fcf51283ce0996a36f211f14b8b18110eeb (patch)
treed07da7e33b810f95ec4638440b36663607a4b410 /etc/inc
parent244741aa8f680b6370990c1a66bc7cb17e53f9a2 (diff)
downloadpfsense-759a6fcf51283ce0996a36f211f14b8b18110eeb.zip
pfsense-759a6fcf51283ce0996a36f211f14b8b18110eeb.tar.gz
Merge pull request #1032 from fichtner/contributions manually since it does not apply cleanly
Diffstat (limited to 'etc/inc')
-rw-r--r--etc/inc/upgrade_config.inc4
1 files changed, 4 insertions, 0 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index b453f82..f001200 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -3150,6 +3150,10 @@ function upgrade_097_to_098() {
function upgrade_098_to_099() {
global $config;
+
+ if (empty($config['dhcpd']) || !is_array($config['dhcpd']))
+ return;
+
foreach ($config['dhcpd'] as & $dhcpifconf) {
if (isset($dhcpifconf['next-server'])) {
$dhcpifconf['nextserver'] = $dhcpifconf['next-server'];
OpenPOWER on IntegriCloud