Revision 5c89fc2c
Added by Renato Botelho over 9 years ago
src/usr/local/www/pkg_mgr_install.php | ||
---|---|---|
392 | 392 |
|
393 | 393 |
if ($_POST) { |
394 | 394 |
$pkgid = str_replace(array("<", ">", ";", "&", "'", '"', '.', '/'), "", htmlspecialchars_decode($_POST['id'], ENT_QUOTES | ENT_HTML401)); |
395 |
if ($pkgid == "firmware") { |
|
396 |
$logfilename = $g['cf_conf_path'] . '/upgrade_log'; |
|
397 |
} else { |
|
398 |
$logfilename = $g['cf_conf_path'] . '/pkg_log_' . $pkgid; |
|
399 |
} |
|
395 | 400 |
} |
396 | 401 |
|
397 | 402 |
if ($_POST['mode'] == 'delete') { |
... | ... | |
460 | 465 |
write_config(gettext("Creating restore point before package installation.")); |
461 | 466 |
|
462 | 467 |
$progbar = true; |
463 |
$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";
|
|
468 |
$upgrade_script = "/usr/local/sbin/{$g['product_name']}-upgrade -y -l {$logfilename}.txt -p {$g['tmp_path']}/{$g['product_name']}-upgrade.sock";
|
|
464 | 469 |
|
465 | 470 |
switch ($_POST['mode']) { |
466 | 471 |
case 'delete': |
... | ... | |
577 | 582 |
url: "pkg_mgr_install.php", |
578 | 583 |
type: "post", |
579 | 584 |
data: { ajax: "ajax", |
580 |
logfilename: "<?=$g['cf_conf_path'];?>/upgrade_log",
|
|
585 |
logfilename: "<?=$logfilename?>",
|
|
581 | 586 |
next_log_line: "0" |
582 | 587 |
} |
583 | 588 |
}); |
Also available in: Unified diff
Use a different log for each package being installed/deleted, fixes #5814