diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2009-08-21 00:59:09 -0400 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2009-08-21 00:59:09 -0400 |
| commit | 135ef84a1008afc599cfcb5bb11c2d3ccdce95cb (patch) | |
| tree | 0a9b64d4624fff3c66f1630ecdc4d0d074ee2c24 /etc/inc/config.inc | |
| parent | e1fc88f1194299f6a37dbb581dbf62462c192ce8 (diff) | |
| download | pfsense-135ef84a1008afc599cfcb5bb11c2d3ccdce95cb.zip pfsense-135ef84a1008afc599cfcb5bb11c2d3ccdce95cb.tar.gz | |
Unbreak parse_config plugins and fix autoconfigbackup
Diffstat (limited to 'etc/inc/config.inc')
| -rw-r--r-- | etc/inc/config.inc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc index f8e55b6..ca3257e 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -240,7 +240,7 @@ function encrypted_configxml() { * $config - array containing all configuration variables ******/ function parse_config($parse = false) { - global $g; + global $g, $config_parsed; $lockkey = lock('config'); if (!file_exists("{$g['conf_path']}/config.xml") || filesize("{$g['conf_path']}/config.xml") == 0) { @@ -304,10 +304,7 @@ function parse_config($parse = false) { alias_make_table($config); unlock($lockkey); - /* process packager manager custom rules */ - if(is_dir("/usr/local/pkg/parse_config")) { - run_plugins("/usr/local/pkg/parse_config/"); - } + $config_parsed = true; return $config; } @@ -1310,4 +1307,11 @@ function set_device_perms() { if($g['booting']) echo "."; $config = parse_config(); -?> +if($config_parsed == true) { + /* process packager manager custom rules */ + if(is_dir("/usr/local/pkg/parse_config")) { + run_plugins("/usr/local/pkg/parse_config/"); + } +} + +?>
\ No newline at end of file |
