diff options
| author | smos <seth.mos@dds.nl> | 2012-06-01 14:24:31 +0200 |
|---|---|---|
| committer | smos <seth.mos@dds.nl> | 2012-06-01 14:25:25 +0200 |
| commit | 730b614846c740a1f8d501ca48bcc20198aeff84 (patch) | |
| tree | f52f770c63df78c3855cef4bd36ddcae85396b58 /etc/inc | |
| parent | 4a5fbf6145e9e4b98408a5d2b288d9ae01fb6253 (diff) | |
| download | pfsense-730b614846c740a1f8d501ca48bcc20198aeff84.zip pfsense-730b614846c740a1f8d501ca48bcc20198aeff84.tar.gz | |
Include util.inc and IPv6.inc before config.lib.inc.
Several parts of the config upgrade relay on functions in these.
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/config.inc | 6 | ||||
| -rw-r--r-- | etc/inc/upgrade_config.inc | 1 |
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 |
