diff options
author | jim-p <jimp@pfsense.org> | 2013-10-10 12:47:51 -0400 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2013-10-10 12:47:51 -0400 |
commit | a3cc14095d777b8cefe99c91be1e015ac695d97e (patch) | |
tree | 579a218ac44086ec53e00948e500d5c82acf2e38 /etc/inc/upgrade_config.inc | |
parent | 0476134494c5e6079b7a98d53732b9448bc69435 (diff) | |
download | pfsense-a3cc14095d777b8cefe99c91be1e015ac695d97e.zip pfsense-a3cc14095d777b8cefe99c91be1e015ac695d97e.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. Also shuffle the upgrade code blocks a bit since we need these on 2.1.x and nobody should be on 2.2 yet, so the impact should be minimal to renumber the one bit specific to 2.2.
Diffstat (limited to 'etc/inc/upgrade_config.inc')
-rw-r--r-- | etc/inc/upgrade_config.inc | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 5d73a27..3311d08 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -3146,6 +3146,21 @@ function upgrade_097_to_098() { } 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']; + } + } +} + +function upgrade_099_to_100() { + require_once("/etc/inc/services.inc"); + install_cron_job("/usr/bin/nice -n20 newsyslog", false); +} + +function upgrade_100_to_101() { global $config, $g; if (!is_array($config['captiveportal'])) @@ -3159,9 +3174,4 @@ function upgrade_098_to_099() { $config['captiveportal'][$cpzone]['passthrumac'][$idx]['action'] = 'pass'; } } - -function upgrade_099_to_100() { - require_once("/etc/inc/services.inc"); - install_cron_job("/usr/bin/nice -n20 newsyslog", false); -} ?> |