summaryrefslogtreecommitdiffstats
path: root/etc/inc/config.inc
diff options
context:
space:
mode:
authorErmal Luçi <eri@pfsense.org>2010-03-03 17:17:41 +0000
committerErmal Luçi <eri@pfsense.org>2010-03-03 17:17:41 +0000
commit6280b10e83115be8aea11e89ad424fb04678f4fb (patch)
tree61ddbf8e4e25aea6c7d98e81543df139fe5909a5 /etc/inc/config.inc
parent6306b5ddc70ce5bbcf9c9c9769755340e0117de4 (diff)
downloadpfsense-6280b10e83115be8aea11e89ad424fb04678f4fb.zip
pfsense-6280b10e83115be8aea11e89ad424fb04678f4fb.tar.gz
Do not try to upgrade from m0n0 config to pfSense config on every invocation of config.inc but only during bootup, basically this gives a lot of speed up in GUI.
Diffstat (limited to 'etc/inc/config.inc')
-rw-r--r--etc/inc/config.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 60f0668..1dd0d9a 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -83,7 +83,7 @@ if(file_exists("/debugging")) {
}
if($g['booting']) echo ".";
-if(file_exists("/cf/conf/config.xml")) {
+if($g['booting'] && file_exists("/cf/conf/config.xml")) {
$config_contents = file_get_contents("/cf/conf/config.xml");
if(stristr($config_contents, "<m0n0wall>") == true) {
if($g['booting']) echo ".";
@@ -101,7 +101,7 @@ if(file_exists("/cf/conf/config.xml")) {
}
/* if our config file exists bail out, we're already set. */
-if ($g['booting'] and !file_exists($g['cf_conf_path'] . "/config.xml") ) {
+else if ($g['booting'] and !file_exists($g['cf_conf_path'] . "/config.xml") ) {
if($g['booting']) echo ".";
/* find the device where config.xml resides and write out an fstab */
unset($cfgdevice);
OpenPOWER on IntegriCloud