From 20c61a6c9b363b9eecd35ee2f1e00aa26bea4dad Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Fri, 22 Jan 2016 13:06:16 -0200 Subject: Use default log file from pfSense-upgrade when it's called by GUI, this will make sure we preserve first part of upgrade after reboot --- src/usr/local/www/pkg_mgr_install.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/usr/local/www/pkg_mgr_install.php b/src/usr/local/www/pkg_mgr_install.php index 6b0876f..6807255 100644 --- a/src/usr/local/www/pkg_mgr_install.php +++ b/src/usr/local/www/pkg_mgr_install.php @@ -450,7 +450,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['tmp_path']}/webgui-log.txt -p {$g['tmp_path']}/webgui-log.sock"; + $upgrade_script = "/usr/local/sbin/{$g['product_name']}-upgrade -y -l {$g['cf_conf_path']}/upgrade_log.txt -p {$g['tmp_path']}/upgrade_logwebgui-log.sock"; switch ($_POST['mode']) { case 'delete': @@ -567,7 +567,7 @@ function getLogsStatus() { url: "pkg_mgr_install.php", type: "post", data: { ajax: "ajax", - logfilename: "/webgui-log", + logfilename: "/upgrade_log", next_log_line: "0" } }); -- cgit v1.1