diff options
| author | jim-p <jimp@pfsense.org> | 2013-10-10 12:49:47 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2013-10-10 12:49:47 -0400 |
| commit | 12f7e3d4ec96ee6b92dbfb8261bd2546607b5358 (patch) | |
| tree | 6f23592cea6b377ef67bb1193a981a8c163988d5 /etc | |
| parent | 6f4a2864ad0e83f152a0cdc9c157f5d95aa8a9c7 (diff) | |
| download | pfsense-12f7e3d4ec96ee6b92dbfb8261bd2546607b5358.zip pfsense-12f7e3d4ec96ee6b92dbfb8261bd2546607b5358.tar.gz | |
Add upgrade code to change the DHCP next-server value to nextserver since it was renamed sometime in 2.1 but upgrade code didn't follow.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/globals.inc | 2 | ||||
| -rw-r--r-- | etc/inc/upgrade_config.inc | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index bdc3c00..4394dc4 100644 --- a/etc/inc/globals.inc +++ b/etc/inc/globals.inc @@ -72,7 +72,7 @@ $g = array( "disablecrashreporter" => false, "crashreporterurl" => "http://crashreporter.pfsense.org/crash_reporter.php", "debug" => false, - "latest_config" => "9.8", + "latest_config" => "9.9", "nopkg_platforms" => array("cdrom"), "minimum_ram_warning" => "101", "minimum_ram_warning_text" => "128 MB", diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 86d3de9..9a85407 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -3144,4 +3144,14 @@ function upgrade_097_to_098() { /* Disable kill_states by default */ $config['system']['kill_states'] = true; } + +function upgrade_098_to_099() { + global $config; + foreach ($config['dhcpd'] as & $dhcpifconf) { + if (isset($dhcpifconf['next-server'])) { + $dhcpifconf['nextserver'] = $dhcpifconf['next-server']; + unset $dhcpifconf['next-server']; + } + } +} ?> |
