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.

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);
-}
 ?>