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

[iso] fix loader/entries/*.conf labels for Arch derivatives...

Browse source 
* ...that didn't get the memo about using UPPERCASE 11-chars max ISO labels.
* There's a reason why Arch labels its ISOs 'ARCH_YYYYMM', people!
* Anyway, EndeavourOS should now work in ISO mode when booted from UEFI.
This commit is contained in:
Pete Batard 2021-09-07 01:07:37 +01:00
parent 8e2a9797cd
commit a787fb34b3
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
3 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/iso.c
View file

@ -177,6 +177,12 @@ static BOOL check_iso_props(const char* psz_dirname, int64_t file_length, const
}
}
// Check for archiso loader/entries/*.conf files
if (safe_stricmp(psz_dirname, "/loader/entries") == 0) {
size_t len = strlen(psz_basename);
props->is_conf = ((len > 4) && (stricmp(&psz_basename[len - 5], ".conf") == 0));
}
// Check for an old incompatible c32 file anywhere
for (i = 0; i < NB_OLD_C32; i++) {
if ((safe_stricmp(psz_basename, old_c32_name[i]) == 0) && (file_length <= old_c32_threshold[i]))
@ -571,7 +577,7 @@ static int udf_extract_files(udf_t *p_udf, udf_dirent_t *p_udf_dirent, const cha
// The drawback however is with cancellation. With a large file, CloseHandle()
// may take forever to complete and is not interruptible. We try to detect this.
ISO_BLOCKING(safe_closehandle(file_handle));
if (props.is_cfg)
if (props.is_cfg || props.is_conf)
fix_config(psz_sanpath, psz_path, psz_basename, &props);
safe_free(psz_sanpath);
}
@ -797,7 +803,7 @@ static int iso_extract_files(iso9660_t* p_iso, const char *psz_path)
uprintf(" Could not set timestamp: %s", WindowsErrorString());
}
ISO_BLOCKING(safe_closehandle(file_handle));
if (props.is_cfg)
if (props.is_cfg || props.is_conf)
fix_config(psz_sanpath, psz_path, psz_basename, &props);
safe_free(psz_sanpath);
}