diff options
| author | Renato Botelho <renato@netgate.com> | 2016-01-26 16:01:36 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-01-26 16:02:56 -0200 |
| commit | 5c89fc2cf948efba29aa352a9bcaa6bcd83b00c4 (patch) | |
| tree | 0be444cd01089b00aed09ba0fe621ce34b4ea8aa /src | |
| parent | f41ff6e5905c962485b8cad607d86fdda24e5783 (diff) | |
| download | pfsense-5c89fc2cf948efba29aa352a9bcaa6bcd83b00c4.zip pfsense-5c89fc2cf948efba29aa352a9bcaa6bcd83b00c4.tar.gz | |
Use a different log for each package being installed/deleted, fixes #5814
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr/local/www/pkg_mgr_install.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/usr/local/www/pkg_mgr_install.php b/src/usr/local/www/pkg_mgr_install.php index f354403..815474e 100644 --- a/src/usr/local/www/pkg_mgr_install.php +++ b/src/usr/local/www/pkg_mgr_install.php @@ -392,6 +392,11 @@ if ($firmwareupdate && !$firmwareversion) { if ($_POST) { $pkgid = str_replace(array("<", ">", ";", "&", "'", '"', '.', '/'), "", htmlspecialchars_decode($_POST['id'], ENT_QUOTES | ENT_HTML401)); + if ($pkgid == "firmware") { + $logfilename = $g['cf_conf_path'] . '/upgrade_log'; + } else { + $logfilename = $g['cf_conf_path'] . '/pkg_log_' . $pkgid; + } } if ($_POST['mode'] == 'delete') { @@ -460,7 +465,7 @@ if ($_POST && ($_POST['completed'] != "true")) { write_config(gettext("Creating restore point before package installation.")); $progbar = true; - $upgrade_script = "/usr/local/sbin/{$g['product_name']}-upgrade -y -l {$g['cf_conf_path']}/upgrade_log.txt -p {$g['tmp_path']}/{$g['product_name']}-upgrade.sock"; + $upgrade_script = "/usr/local/sbin/{$g['product_name']}-upgrade -y -l {$logfilename}.txt -p {$g['tmp_path']}/{$g['product_name']}-upgrade.sock"; switch ($_POST['mode']) { case 'delete': @@ -577,7 +582,7 @@ function getLogsStatus() { url: "pkg_mgr_install.php", type: "post", data: { ajax: "ajax", - logfilename: "<?=$g['cf_conf_path'];?>/upgrade_log", + logfilename: "<?=$logfilename?>", next_log_line: "0" } }); |
