diff options
| author | Phil Davis <phil.davis@inf.org> | 2014-06-26 15:17:40 +0545 |
|---|---|---|
| committer | Phil Davis <phil.davis@inf.org> | 2014-06-26 15:17:40 +0545 |
| commit | 0ee6026764e74d79addb204e4ed8ed2d815ccd38 (patch) | |
| tree | 0a840ebc824163367a57ed433b311cf409704303 | |
| parent | efac3a1346867481d6cfcea62c131ad0c0de391b (diff) | |
| download | pfsense-0ee6026764e74d79addb204e4ed8ed2d815ccd38.zip pfsense-0ee6026764e74d79addb204e4ed8ed2d815ccd38.tar.gz | |
Handle no dhcpd settings when upgrading
This minor fix was in master but not 2.1 branch. I noticed the warning message when doing a fresh install/test of 2.1.4-release. It prevents the warning message:
Warning: Invalid argument supplied for foreach() in /etc/inc/upgrade_config.inc on line 3153
Might as well fix it it 2.1-branch also, in case there is another 2.1.n release.
| -rw-r--r-- | etc/inc/upgrade_config.inc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 7060079..1094325 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']; |
