diff options
| author | Renato Botelho <renato@netgate.com> | 2017-03-03 11:54:10 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-03-06 15:34:13 -0300 |
| commit | 55f9e4b0e2db48355344cd52798324809b13cef1 (patch) | |
| tree | 1515a9d131fdfb101ac866800209923e7a3a47b8 /src/usr/local/www/pkg_mgr_install.php | |
| parent | 6534026bc1b0d9dcc9ac8c85b16d2fc2860db1f1 (diff) | |
| download | pfsense-55f9e4b0e2db48355344cd52798324809b13cef1.zip pfsense-55f9e4b0e2db48355344cd52798324809b13cef1.tar.gz | |
Deduplicate code
Diffstat (limited to 'src/usr/local/www/pkg_mgr_install.php')
| -rw-r--r-- | src/usr/local/www/pkg_mgr_install.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/usr/local/www/pkg_mgr_install.php b/src/usr/local/www/pkg_mgr_install.php index ecd80e1..df3147d 100644 --- a/src/usr/local/www/pkg_mgr_install.php +++ b/src/usr/local/www/pkg_mgr_install.php @@ -58,6 +58,7 @@ $guiretry = 20; // Seconds to try again if $guitimeout was not long enough // Todo: // Respect next_log_line and append log to output window rather than writing it +$pidfile = $g['varrun_path'] . '/' . $g['product_name'] . '-upgrade.pid'; if ($_REQUEST['ajax']) { $response = ""; @@ -72,7 +73,6 @@ if ($_REQUEST['ajax']) { } // Check to see if our process is still running - $pidfile = $g['varrun_path'] . '/' . $g['product_name'] . '-upgrade.pid'; $running = "running"; // When we do a reinstallall, it is technically possible that we might catch the system in-between @@ -406,7 +406,6 @@ if ($firmwareupdate) { if ($confirmed): // XXX: What if the user navigates away from this page and then comes back via his/her "Back" button? - $pidfile = $g['varrun_path'] . '/' . $g['product_name'] . '-upgrade.pid'; if (isvalidpid($pidfile)) { $start_polling = true; |
