diff options
author | Colin Smith <colin@pfsense.org> | 2005-04-18 02:09:44 +0000 |
---|---|---|
committer | Colin Smith <colin@pfsense.org> | 2005-04-18 02:09:44 +0000 |
commit | 1c62837e0f1d8581bba55a36ffdbf2b5ece044d1 (patch) | |
tree | 012b21c3a839ebe124655a948346b7a00b3912e7 /usr/local/www/system_firmware_auto.php | |
parent | 96ea6c029b113f45329ef129dca39d9687d19198 (diff) | |
download | pfsense-1c62837e0f1d8581bba55a36ffdbf2b5ece044d1.zip pfsense-1c62837e0f1d8581bba55a36ffdbf2b5ece044d1.tar.gz |
Log all md5 mismatches to /tmp/bdiff.log
Diffstat (limited to 'usr/local/www/system_firmware_auto.php')
-rwxr-xr-x | usr/local/www/system_firmware_auto.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/usr/local/www/system_firmware_auto.php b/usr/local/www/system_firmware_auto.php index 649b7fc..7c97782 100755 --- a/usr/local/www/system_firmware_auto.php +++ b/usr/local/www/system_firmware_auto.php @@ -153,6 +153,7 @@ update_output_window($static_text); if($use_old_checkversion == false) { $upgrades = array('firmware', 'kernel', 'base'); + $bdiff_errors = array(); if(array_shift($versions) == true) { $i = 0; $need_update = array(); @@ -185,8 +186,7 @@ if($use_old_checkversion == false) { update_output_window($static_text); system("/etc/rc.firmware delta_firmware /tmp/" . $tofetch); if(file_exists("/tmp/bdiff.log")) { - $static_text .= ".\n\nAn md5 mismatch was detected during the update process. Aborting..."; - break 2; + $bdiff_errors[] = file_get_contents("/tmp/bdiff.log"); } if($s == count($aver) - 1) { $static_text .= ".\n"; @@ -199,6 +199,12 @@ if($use_old_checkversion == false) { } $i++; } + + if(is_string($bdiff_errors[0])) { + $static_text .= "\nOne or more md5 mismatches occurred during patch application."; + update_output_window($static_text); + file_put_contents("/tmp/bdiff.log", print_r($bdiff_errors, true)); + } } else { if($versions != "") { update_output_window("Using old checkversion method. Text returned from pfSense.com:\n\n" . $versions . "\n\nUpgrading..."); |