summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/config.inc6
-rw-r--r--etc/inc/upgrade_config.inc1
2 files changed, 3 insertions, 4 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index a671212..b8199df 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -63,12 +63,12 @@ else
/* include globals from notices.inc /utility/XML parser files */
require_once("notices.inc");
if($g['booting']) echo ".";
-require_once('config.lib.inc');
-if($g['booting']) echo ".";
require_once("util.inc");
if($g['booting']) echo ".";
require_once("IPv6.inc");
if($g['booting']) echo ".";
+require_once('config.lib.inc');
+if($g['booting']) echo ".";
if(file_exists("/cf/conf/use_xmlreader"))
require_once("xmlreader.inc");
else
@@ -221,4 +221,4 @@ if($config_parsed == true) {
}
}
-?> \ No newline at end of file
+?>
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index 3e6d031..b42b837 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -36,7 +36,6 @@ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
if(!function_exists("dump_rrd_to_xml"))
require("rrd.inc");
-require_once("util.inc");
/* Upgrade functions must be named:
* upgrade_XXX_to_YYY
OpenPOWER on IntegriCloud