summaryrefslogtreecommitdiffstats
path: root/etc/inc/config.lib.inc
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2014-11-28 12:43:51 -0200
committerRenato Botelho <garga@FreeBSD.org>2014-11-28 12:43:51 -0200
commit16d6c1df8c5b110c9fd7a5e9238d03b820ed2445 (patch)
tree8998f21489549aa4741e55a7e224fc90733a2e74 /etc/inc/config.lib.inc
parent5acce70485914b0f79df3a675c21d39a0079b89e (diff)
downloadpfsense-16d6c1df8c5b110c9fd7a5e9238d03b820ed2445.zip
pfsense-16d6c1df8c5b110c9fd7a5e9238d03b820ed2445.tar.gz
Add a parameter on platform_booting to help detect if it's on GUI on console and use it in appropriate places, it fixes #4049
Diffstat (limited to 'etc/inc/config.lib.inc')
-rw-r--r--etc/inc/config.lib.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/inc/config.lib.inc b/etc/inc/config.lib.inc
index 63e36e9..1b006e9 100644
--- a/etc/inc/config.lib.inc
+++ b/etc/inc/config.lib.inc
@@ -111,7 +111,7 @@ function parse_config($parse = false) {
}
}
- if (platform_booting())
+ if (platform_booting(true))
echo ".";
// Check for encrypted config.xml
@@ -127,7 +127,7 @@ function parse_config($parse = false) {
}
if ($parse == true) {
if(!file_exists($g['conf_path'] . "/config.xml")) {
- if (platform_booting())
+ if (platform_booting(true))
echo ".";
log_error("No config.xml found, attempting last known config restore.");
file_notice("config.xml", "No config.xml found, attempting last known config restore.", "pfSenseConfigurator", "");
@@ -154,7 +154,7 @@ function parse_config($parse = false) {
generate_config_cache($config);
}
- if (platform_booting())
+ if (platform_booting(true))
echo ".";
$config_parsed = true;
OpenPOWER on IntegriCloud