Deprecate nanobsd platform and remove all conditionals that uses it

1 files changed, 5 insertions, 5 deletions

diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc
index a0f6b67..0fd7a79 100644
--- a/src/etc/inc/upgrade_config.inc
+++ b/src/etc/inc/upgrade_config.inc
@@ -2064,7 +2064,7 @@ function upgrade_054_to_055() {
 
 	$rrddbpath = "/var/db/rrd/";
 	$rrdtool = "/usr/bin/nice -n20 /usr/local/bin/rrdtool";
-	if ($g['platform'] != $g['product_name']) {
+	if (isset($config['system']['use_mfs_tmpvar'])) {
 		/* restore the databases, if we have one */
 		if (restore_rrd()) {
 			/* Make sure to move the rrd backup out of the way. We will make a new one after converting. */
@@ -2783,7 +2783,7 @@ function upgrade_080_to_081() {
 	$rrddbpath = "/var/db/rrd/";
 	$rrdtool = "/usr/bin/nice -n20 /usr/local/bin/rrdtool";
 
-	if ($g['platform'] != $g['product_name']) {
+	if (isset($config['system']['use_mfs_tmpvar'])) {
 		/* restore the databases, if we have one */
 		if (restore_rrd()) {
 			/* Make sure to move the rrd backup out of the way. We will make a new one after converting. */
@@ -3255,7 +3255,7 @@ function upgrade_095_to_096() {
 	$rrddbpath = "/var/db/rrd";
 	$rrdtool = "/usr/local/bin/rrdtool";
 
-	if ($g['platform'] != $g['product_name']) {
+	if (isset($config['system']['use_mfs_tmpvar'])) {
 		/* restore the databases, if we have one */
 		if (restore_rrd()) {
 			/* Make sure to move the rrd backup out of the way. We will make a new one after converting. */
@@ -4647,7 +4647,7 @@ function upgrade_145_to_146() {
 	$awkcmd .= "    print;\n";
 	$awkcmd .= "}'";
 
-	if ($g['platform'] != $g['product_name']) {
+	if (isset($config['system']['use_mfs_tmpvar'])) {
 		/* restore the databases, if we have one */
 		if (restore_rrd()) {
 			/* Make sure to move the rrd backup out of the way. We will make a new one after converting. */
@@ -4866,7 +4866,7 @@ function upgrade_151_to_152() {
 	require_once("/etc/inc/services.inc");
 
 	// Remove these cron jobs on full install if not using ramdisk.
-	if (($g['platform'] == $g['product_name']) && !isset($config['system']['use_mfs_tmpvar'])) {
+	if (!isset($config['system']['use_mfs_tmpvar'])) {
 		install_cron_job("/etc/rc.backup_rrd.sh", false);
 		install_cron_job("/etc/rc.backup_dhcpleases.sh", false);
 	}