mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

pkg_mgr_install - only mount rw when needed

Browse Source 
When entering pkg_mgr_install the filesystem was being mounted rw and a backup made of the config, even if the case was "showlog" or "installedinfo". This resulted in:
a) an extra "backup" of the config being made after an install - it could be seen in Diagnostics, Backup Restore, Config History
b) Unnecessary conf_mount_rw and conf_mount_ro calls. These slow down the process on nanobsd-like systems.
This change fixes both these issues.
This commit is contained in:
Phil Davis 2012-08-03 13:39:16 +05:45
parent 17ad49a94c
commit 06aa745e29
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
usr/local/www/pkg_mgr_install.php
View File

@ -120,11 +120,20 @@ Rounded("div#mainareapkg","bl br","#FFF","#eeeeee","smooth");
ob_flush();
// Write out configuration to creatae a backup prior to pkg install
write_config(gettext("Creating restore point before package installation."));
/* mount rw fs */
conf_mount_rw();
switch($_GET['mode']) {
case "showlog":
case "installedinfo":
/* These cases do not make changes. */
$fs_mounted_rw = false;
break;
default:
/* All other cases make changes, so mount rw fs */
conf_mount_rw();
$fs_mounted_rw = true;
/* Write out configuration to create a backup prior to pkg install. */
write_config(gettext("Creating restore point before package installation."));
break;
}
switch($_GET['mode']) {
case "delete":
@ -213,7 +222,8 @@ rmdir_recursive("/var/tmp/instmp*");
if($fd_log)
fclose($fd_log);
/* read only fs */
conf_mount_ro();
if($fs_mounted_rw) {
/* Restore to read only fs */
conf_mount_ro();
}
?>