summaryrefslogtreecommitdiffstats
path: root/etc/inc/config.inc
diff options
context:
space:
mode:
authorErmal LUÇI <eri@pfsense.org>2014-11-28 13:11:12 +0100
committerErmal LUÇI <eri@pfsense.org>2014-11-28 13:11:12 +0100
commite48a7cf4b1e7aa4de910641654081231f2dcb9b0 (patch)
tree179e8aa328380469893b08f0ebc5284a90bb7ea9 /etc/inc/config.inc
parentd8648df4edd62072ba8a5cad7ee7e8ce5ce26909 (diff)
downloadpfsense-e48a7cf4b1e7aa4de910641654081231f2dcb9b0.zip
pfsense-e48a7cf4b1e7aa4de910641654081231f2dcb9b0.tar.gz
Remove the . here they just confuse things as in Ticket #4049. Also check that the script is called from console to trigger the convertion and mounting of floppy.
Diffstat (limited to 'etc/inc/config.inc')
-rw-r--r--etc/inc/config.inc10
1 files changed, 1 insertions, 9 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 0186e18..721427c 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -45,8 +45,6 @@
if (!function_exists('platform_booting'))
require_once('globals.inc');
-if(platform_booting()) echo ".";
-
/* do not load this file twice. */
//if (in_array("/etc/inc/config.inc", get_included_files()))
// return;
@@ -65,22 +63,16 @@ else
/* include globals from notices.inc /utility/XML parser files */
require_once("notices.inc");
-if(platform_booting()) echo ".";
require_once("util.inc");
-if(platform_booting()) echo ".";
require_once("IPv6.inc");
-if(platform_booting()) echo ".";
require_once('config.lib.inc');
-if(platform_booting()) echo ".";
if(file_exists("/cf/conf/use_xmlreader"))
require_once("xmlreader.inc");
else
require_once("xmlparse.inc");
-if(platform_booting()) echo ".";
require_once("crypt.inc");
/* read platform */
-if(platform_booting()) echo ".";
if (file_exists("{$g['etc_path']}/platform")) {
$g['platform'] = chop(file_get_contents("{$g['etc_path']}/platform"));
} else {
@@ -94,7 +86,7 @@ if(file_exists("/debugging")) {
$g['debug'] = true;
}
-if(platform_booting()) {
+if(platform_booting() && php_sapi_name() != 'fpm-cgi') {
echo ".";
if(file_exists("/cf/conf/config.xml")) {
$config_contents = file_get_contents("/cf/conf/config.xml");
OpenPOWER on IntegriCloud