diff options
| author | Renato Botelho <renato@netgate.com> | 2015-09-18 11:16:58 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-09-18 11:22:54 -0300 |
| commit | e8a3a81b65c7e5551b840d7aec7cca41b3e28867 (patch) | |
| tree | 4c13b3d4e1fd38b82231543c6446dda995f66b56 | |
| parent | d0613e4fb399a61355761bb07efa3a8a229eb707 (diff) | |
| download | pfsense-e8a3a81b65c7e5551b840d7aec7cca41b3e28867.zip pfsense-e8a3a81b65c7e5551b840d7aec7cca41b3e28867.tar.gz | |
Call conf_mount_ro() in better place
Do not call conf_mount_ro just before call write_config(),
write_config() calls conf_mount_(rw|ro), and if filesystem is already
mounted in rw state, it'll only increase the refcounter
| -rw-r--r-- | src/etc/inc/pkg-utils.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/etc/inc/pkg-utils.inc b/src/etc/inc/pkg-utils.inc index d18efe8..8fb96bd 100644 --- a/src/etc/inc/pkg-utils.inc +++ b/src/etc/inc/pkg-utils.inc @@ -560,8 +560,8 @@ function install_package_xml($package_name) { $to_output = gettext("overwrite!") . "\n"; } unlink_if_exists('/conf/needs_package_sync'); - conf_mount_ro(); write_config("Intermediate config write during package install for {$pkg_info['name']}."); + conf_mount_ro(); $static_output .= $to_output; update_output_window($static_output); @@ -873,7 +873,6 @@ function delete_package_xml($package_name, $when = "post-deinstall") { update_output_window($static_output); } - conf_mount_ro(); /* remove config.xml entries */ $static_output .= gettext("Configuration... "); update_output_window($static_output); @@ -881,6 +880,7 @@ function delete_package_xml($package_name, $when = "post-deinstall") { $static_output .= gettext("done.") . "\n"; update_output_window($static_output); write_config("Removed {$package_name} package.\n"); + conf_mount_ro(); } function pkg_reinstall_all() { |
