Move workaround used to enable pkg metadata update cronjob to a generic mechanism

2 files changed, 35 insertions, 30 deletions

diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc
index 2d215ff..dc00ee1 100644
--- a/src/etc/inc/upgrade_config.inc
+++ b/src/etc/inc/upgrade_config.inc
@@ -5067,6 +5067,41 @@ function upgrade_157_to_158() {
  */
 function additional_config_upgrade() {
 	global $config;
+
+	if (!is_array($config['system']['already_run_config_upgrade'])) {
+		$config['system']['already_run_config_upgrade'] = array();
+	}
+	$already_run =& $config['system']['already_run_config_upgrade'];
+
+	/* Copy of upgrade_168_to_169() from 2.4 */
+	if (!isset($already_run['upgrade_168_to_169'])) {
+		$command = '/usr/bin/nice -n20 /etc/rc.update_pkg_metadata';
+
+		$found = false;
+		if (is_array($config['cron']['item'])) {
+			foreach ($config['cron']['item'] as $entry) {
+				if ($entry['command'] == $command) {
+					$found = true;
+					break;
+				}
+			}
+		}
+
+		if (!$found) {
+			$config['cron']['item'][] = array(
+				'minute' => '1',
+				'hour' => '0',
+				'mday' => '*',
+				'month' => '*',
+				'wday' => '*',
+				'who' => 'root',
+				'command' => $command
+			);
+		}
+
+		$already_run['upgrade_168_to_169'] = true;
+	}
+
 }
 
 ?>
diff --git a/src/etc/rc.bootup b/src/etc/rc.bootup
index fc3121d..ff65eb1 100755
--- a/src/etc/rc.bootup
+++ b/src/etc/rc.bootup
@@ -331,36 +331,6 @@ if ($realmem > 0 and $realmem < 65) {
 	system_webgui_start();
 }
 
-/* Workaround to add pkg metadata update cronjob on 2.3 */
-if (!isset($config['cron']['rc_update_pkg_metadata'])) {
-	$command = '/usr/bin/nice -n20 /etc/rc.update_pkg_metadata';
-
-	$found = false;
-	if (is_array($config['cron']['item'])) {
-		foreach ($config['cron']['item'] as $entry) {
-			if ($entry['command'] == $command) {
-				$found = true;
-				break;
-			}
-		}
-	}
-
-	if (!$found) {
-		$config['cron']['item'][] = array(
-			'minute' => '1',
-			'hour' => '0',
-			'mday' => '*',
-			'month' => '*',
-			'wday' => '*',
-			'who' => 'root',
-			'command' => $command
-		);
-	}
-
-	$config['cron']['rc_update_pkg_metadata'] = true;
-	write_config("Registered rc.update_pkg_metadata cronjob");
-}
-
 /* configure cron service */
 echo "Configuring CRON...";
 configure_cron();