From fea6ef31f8a1f92afb3b277f9e6822f6f392843e Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sun, 4 Nov 2018 13:24:35 +0100
Subject: [PATCH] system: remove old use_mfs_tmpvar workaround

Leave [^_] in place as there used to be use_mfs_var_size
and use_mfs_tmp_size before we migrated to tmpfs.
---
 src/etc/rc.subr.d/var            |  2 +-
 src/www/system_advanced_misc.php | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/etc/rc.subr.d/var b/src/etc/rc.subr.d/var
index ff4cec90b..af7859c3f 100755
--- a/src/etc/rc.subr.d/var
+++ b/src/etc/rc.subr.d/var
@@ -111,7 +111,7 @@ for RC_FILE in ${RC_FILES}; do
 	done
 done
 
-USE_MFS_VAR=$(/usr/bin/grep -c 'use_mfs_.*var[^_]' /conf/config.xml)
+USE_MFS_VAR=$(/usr/bin/grep -c 'use_mfs_var[^_]' /conf/config.xml)
 
 # see if / is writable (aka. non-LiveCD boot)
 if _tmpdir=$(mktemp -d -q /.diskless.XXXXXX); then
diff --git a/src/www/system_advanced_misc.php b/src/www/system_advanced_misc.php
index 9ba3f1819..f9270c4f5 100644
--- a/src/www/system_advanced_misc.php
+++ b/src/www/system_advanced_misc.php
@@ -79,9 +79,8 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     $pconfig['crypto_hardware'] = !empty($config['system']['crypto_hardware']) ? $config['system']['crypto_hardware'] : null;
     $pconfig['cryptodev_enable'] = isset($config['system']['cryptodev_enable']);
     $pconfig['thermal_hardware'] = !empty($config['system']['thermal_hardware']) ? $config['system']['thermal_hardware'] : null;
-    /* if the old use_mfs_tmpvar is found, set these flags, too */
-    $pconfig['use_mfs_var'] = isset($config['system']['use_mfs_tmpvar']) || isset($config['system']['use_mfs_var']);
-    $pconfig['use_mfs_tmp'] = isset($config['system']['use_mfs_tmpvar']) || isset($config['system']['use_mfs_tmp']);
+    $pconfig['use_mfs_var'] = isset($config['system']['use_mfs_var']);
+    $pconfig['use_mfs_tmp'] = isset($config['system']['use_mfs_tmp']);
     $pconfig['use_swap_file'] = isset($config['system']['use_swap_file']);
     $pconfig['dhparamusage'] = !empty($config['system']['dhparamusage']) ? $config['system']['dhparamusage'] : null;
     $pconfig['rrdbackup'] = !empty($config['system']['rrdbackup']) ? $config['system']['rrdbackup'] : null;
@@ -147,11 +146,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
             unset($config['system']['use_mfs_var']);
         }
 
-        /* XXX config used to have this, but we've split it up in 17.1 */
-        if (isset($config['system']['use_mfs_tmpvar'])) {
-            unset($config['system']['use_mfs_tmpvar']);
-        }
-
         if (!empty($pconfig['use_mfs_tmp'])) {
             $config['system']['use_mfs_tmp'] = true;
         } elseif (isset($config['system']['use_mfs_tmp'])) {