mirrors/rufus
1
0
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2025-06-05 17:14:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[iso] fix md5sum.txt update for Ubuntu 20.10

Browse source 
* Ubuntu switched to using GRUB for BIOS, so our update_md5sum() code was not being called.
* Move update_md5sum() to being called unconditionally to fix this.
* Closes #1616 (again...)
This commit is contained in:
Pete Batard 2020-10-05 12:39:52 +01:00
parent f4c7f2963c
commit 2d272b7991
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
3 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/iso.c
View file

@ -598,16 +598,16 @@ static void update_md5sum(void)
char md5_path[64], *md5_data = NULL, *str_pos;
if (!img_report.has_md5sum)
return;
goto out;
assert(img_report.has_md5sum <= ARRAYSIZE(md5sum_name));
if (img_report.has_md5sum > ARRAYSIZE(md5sum_name))
return;
goto out;
static_sprintf(md5_path, "%s\\%s", psz_extract_dir, md5sum_name[img_report.has_md5sum - 1]);
md5_size = read_file(md5_path, (uint8_t**)&md5_data);
if (md5_size == 0)
return;
goto out;
for (i = 0; i < modified_path.Index; i++) {
str_pos = strstr(md5_data, &modified_path.String[i][2]);
@ -635,6 +635,9 @@ static void update_md5sum(void)
write_file(md5_path, md5_data, md5_size);
free(md5_data);
out:
StrArrayDestroy(&modified_path);
}
// Returns 0 on success, >0 on error, <0 to ignore current dir
@ -1108,12 +1111,11 @@ out:
}
if (fd != NULL)
fclose(fd);
update_md5sum();
} else if (HAS_BOOTMGR(img_report) && enable_ntfs_compression) {
// bootmgr might need to be uncompressed: https://github.com/pbatard/rufus/issues/1381
RunCommand("compact /u bootmgr* efi/boot/*.efi", dest_dir, TRUE);
}
StrArrayDestroy(&modified_path);
update_md5sum();
if (archive_path != NULL) {
uprintf("● Adding files from %s", archive_path);
bled_init(NULL, NULL, NULL, NULL, alt_print_extracted_file, NULL);