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

Fix #8519

Browse Source 
- Remove possible leftover sockfile before call pfSense-upgrade
- Wait until sockfile exists while process is still running
- Make sure to start polling only if process is running and sockfile
  exists
This commit is contained in:
Renato Botelho 2018-08-20 15:15:45 -03:00
parent d93b569553
commit b3cd2eb416
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/usr/local/www/pkg_mgr_install.php
View File

@ -611,16 +611,17 @@ if (!isvalidpid($gui_pidfile) && $confirmed && !$completed) {
$upgrade_script = "{$pfsense_upgrade} -y -l " .
"{$logfilename}.txt -p {$sock_file}";
unlink_if_exists($sock_file);
$execpid = mwexec_bg("{$upgrade_script} {$params}");
// Make sure the upgrade process starts
for ($cnt=0;
((!posix_kill($execpid, 0) || !file_exists($sock_file))) && $cnt<5;
$cnt++) {
while (posix_kill($execpid, 0) && !file_exists(
$sock_file)) {
sleep(1);
}
if (file_exists($sock_file)) {
if (posix_kill($execpid, 0) && file_exists(
$sock_file)) {
$start_polling = true;
@file_put_contents($gui_pidfile, $execpid);
@file_put_contents($gui_mode, $mode);