summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2010-07-28 10:38:29 -0400
committerScott Ullrich <sullrich@pfsense.org>2010-07-28 10:38:29 -0400
commit1295e7691a5b50685e6baf176c3e677aba0fd17c (patch)
tree8f54f08b416d792ed99c4d7ec85c2725879ad8ec /etc
parenta133bb38b2bee410bcefa8b22f8df758bca4c26f (diff)
downloadpfsense-1295e7691a5b50685e6baf176c3e677aba0fd17c.zip
pfsense-1295e7691a5b50685e6baf176c3e677aba0fd17c.tar.gz
Remove config.extra.xml, I will just merge the remote configuration areas right into config.xml
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/config.lib.inc22
1 files changed, 1 insertions, 21 deletions
diff --git a/etc/inc/config.lib.inc b/etc/inc/config.lib.inc
index c4f8292..5b5d459 100644
--- a/etc/inc/config.lib.inc
+++ b/etc/inc/config.lib.inc
@@ -90,7 +90,7 @@ function encrypted_configxml() {
* RESULT
* $config - array containing all configuration variables
******/
-function parse_config($parse = false, $parse_extra = true) {
+function parse_config($parse = false) {
global $g, $config_parsed, $config_extra;
$lockkey = lock('config');
@@ -152,26 +152,6 @@ function parse_config($parse = false, $parse_extra = true) {
}
generate_config_cache($config);
}
- /*
- * This is used for external management system add-ons
- * allowing for example multiple configuration sections
- * from a remote management system that does not clobber
- * the system specific configuration. This routine
- * merges the extra configuration data into $config
- * and allows for external management systems to
- * automatically configure specific services, etc.
- */
- if(file_exists($g['conf_path'] . "/config.extra.xml") && $parse_extra) {
- if(file_exists($g['tmp_path'] . '/config.extra.cache')) {
- $config_extra = unserialize(file_get_contents($g['tmp_path'] . '/config.extra.cache'));
- } else {
- if($g['booting']) echo ".";
- $config_extra = parse_xml_config($g['conf_path'] . '/config.extra.xml', $g['xml_rootobj']);
- if($g['booting']) echo ".";
- $config = array_merge($config, $config_extra);
- if($g['booting']) echo ".";
- }
- }
if($g['booting']) echo ".";
alias_make_table($config);
$config_parsed = true;
OpenPOWER on IntegriCloud