diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2005-07-24 21:21:26 +0000 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2005-07-24 21:21:26 +0000 |
commit | 02facbd03373b0e574ff4e6bc4fc317e1a3fc7c0 (patch) | |
tree | 5f20dffe64cace26dbd68d02e4a05b6289db06c6 | |
parent | 0a1e19604e73fa2d32d01c33aa56d3b8cda81f33 (diff) | |
download | pfsense-02facbd03373b0e574ff4e6bc4fc317e1a3fc7c0.zip pfsense-02facbd03373b0e574ff4e6bc4fc317e1a3fc7c0.tar.gz |
Do not mount configuration ro after writing configuration with write_config() if we're booting
-rw-r--r-- | etc/inc/config.inc | 6 | ||||
-rwxr-xr-x | etc/sshd | 2 | ||||
-rw-r--r-- | etc/version | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc index 83ccecd..85f1716 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -701,7 +701,11 @@ function write_config($desc="Unknown", $backup = true) { fwrite($fd, $xmlconfig); fclose($fd); - conf_mount_ro(); + if(!$g['booting']) { + conf_mount_ro(); + + } + config_unlock(); // Always reparse the config after it's written - something is getting lost in serialize(). @@ -37,8 +37,6 @@ return $size; } - conf_mount_rw(); - /* if any of these files are 0 bytes then they are corrupted. * remove them */ diff --git a/etc/version b/etc/version index f068e81..01661f4 100644 --- a/etc/version +++ b/etc/version @@ -1 +1 @@ -0.70.12
\ No newline at end of file +0.71
\ No newline at end of file |