From dc6de4ae875fa791c1a24993cd184684763ab954 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 27 Apr 2015 22:38:18 +0200
Subject: [PATCH] inc: remove stale and inconsistent `use_mfs_tmpvar' code

---
 src/etc/inc/rrd.inc      | 4 ----
 src/etc/inc/services.inc | 8 --------
 2 files changed, 12 deletions(-)

diff --git a/src/etc/inc/rrd.inc b/src/etc/inc/rrd.inc
index f6fba806c..2cc23e5ae 100644
--- a/src/etc/inc/rrd.inc
+++ b/src/etc/inc/rrd.inc
@@ -75,10 +75,6 @@ function restore_rrd()
 			unset($output);
 			@unlink($xml_file);
 		}
-		/* If this backup is still there on a full install, but we aren't going to use ram disks, remove the archive since this is a transition. */
-		if (!isset($config['system']['use_mfs_tmpvar'])) {
-			@unlink('/conf/rrd.tgz');
-		}
 		return true;
 	}
 	return false;
diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc
index 1bc98c49d..487d5cb71 100644
--- a/src/etc/inc/services.inc
+++ b/src/etc/inc/services.inc
@@ -386,10 +386,6 @@ function services_dhcpdv4_configure()
 				log_error(sprintf(gettext('DHCP leases restore failed exited with %1$s, the error is: %2$s%3$s'), $dhcpreturn, $dhcprestore, "\n"));
 			}
 		}
-		/* If this backup is still there on a full install, but we aren't going to use ram disks, remove the archive since this is a transition. */
-		if (!isset($config['system']['use_mfs_tmpvar'])) {
-			@unlink('/conf/dhcpleases.tgz');
-		}
 	}
 
 	$syscfg = $config['system'];
@@ -1006,10 +1002,6 @@ function services_dhcpdv6_configure($blacklist = array())
 
 			}
 		}
-		/* If this backup is still there on a full install, but we aren't going to use ram disks, remove the archive since this is a transition. */
-		if (isset($config['system']['use_mfs_tmpvar'])) {
-			@unlink('/conf/dhcp6leases.tgz');
-		}
 	}
 
 	$syscfg = $config['system'];