diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-10-09 23:56:32 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-10-09 23:56:32 +0000 |
| commit | 80c023281e4eba4608511d6e9f5723d6bb56256b (patch) | |
| tree | 4449497f46a62ce72b5d1ef66a7304b23211f7fd /etc/inc/config.inc | |
| parent | 588a183b0e58f09932ffef35cc0003cca2313aba (diff) | |
| download | pfsense-80c023281e4eba4608511d6e9f5723d6bb56256b.zip pfsense-80c023281e4eba4608511d6e9f5723d6bb56256b.tar.gz | |
* Parse config (false)
* Clear config.cache if it exists during config_install()
Diffstat (limited to 'etc/inc/config.inc')
| -rw-r--r-- | etc/inc/config.inc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc index c117079..fe29c83 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -174,6 +174,8 @@ $config = parse_config(); function parse_config($parse = false) { global $g; + $raw_configuration_file = + config_lock(); if(!$parse) { if(file_exists($g['tmp_path'] . '/config.cache')) { @@ -837,9 +839,14 @@ function config_install($conffile) { config_lock(); conf_mount_rw(); - + + copy($conffile, "{$g['conf_path']}/config.xml"); - + + /* unlink cache file if it exists */ + if(file_exists("{$g['tmp_path']}/config.cache")) + unlink("{$g['tmp_path']}/config.cache"); + conf_mount_ro(); config_unlock(); |
