mirrors/rufus
1
0
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2025-05-22 10:55:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

[iso] enforce DD mode for Proxmox ISOHybrid images

Browse source
This commit is contained in:
Pete Batard 2022-06-07 16:39:03 +01:00
parent df5cfe94c1
commit c2cd5185a3
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/iso.c
View file

@ -93,6 +93,7 @@ static const char* ldlinux_name = "ldlinux.sys";
static const char* ldlinux_c32 = "ldlinux.c32"; static const char* ldlinux_c32 = "ldlinux.c32";
static const char* md5sum_name[] = { "MD5SUMS", "md5sum.txt" }; static const char* md5sum_name[] = { "MD5SUMS", "md5sum.txt" };
static const char* casper_dirname = "/casper"; static const char* casper_dirname = "/casper";
static const char* proxmox_dirname = "/proxmox";
static const char* efi_dirname = "/efi/boot"; static const char* efi_dirname = "/efi/boot";
static const char* efi_bootname[MAX_ARCHS] = { static const char* efi_bootname[MAX_ARCHS] = {
"bootia32.efi", "bootia64.efi", "bootx64.efi", "bootarm.efi", "bootaa64.efi", "bootia32.efi", "bootia64.efi", "bootx64.efi", "bootarm.efi", "bootaa64.efi",
@ -229,7 +230,12 @@ static BOOL check_iso_props(const char* psz_dirname, int64_t file_length, const
img_report.disable_iso = TRUE; img_report.disable_iso = TRUE;
} }
// Check for various files in root (psz_dirname = "") // Check for a '/proxmox' directory
if (safe_stricmp(psz_dirname, proxmox_dirname) == 0) {
img_report.disable_iso = TRUE;
}
// Check for various files and directories in root (psz_dirname = "")
if ((psz_dirname != NULL) && (psz_dirname[0] == 0)) { if ((psz_dirname != NULL) && (psz_dirname[0] == 0)) {
if (safe_stricmp(psz_basename, bootmgr_name) == 0) { if (safe_stricmp(psz_basename, bootmgr_name) == 0) {
img_report.has_bootmgr = TRUE; img_report.has_bootmgr = TRUE;

10
src/rufus.rc
View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 232, 326 IDD_DIALOG DIALOGEX 12, 12, 232, 326
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 3.19.1894" CAPTION "Rufus 3.19.1895"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@ -395,8 +395,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,19,1894,0 FILEVERSION 3,19,1895,0
PRODUCTVERSION 3,19,1894,0 PRODUCTVERSION 3,19,1895,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -414,13 +414,13 @@ BEGIN
VALUE "Comments", "https://rufus.ie" VALUE "Comments", "https://rufus.ie"
VALUE "CompanyName", "Akeo Consulting" VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "3.19.1894" VALUE "FileVersion", "3.19.1895"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2022 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2022 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
VALUE "OriginalFilename", "rufus-3.19.exe" VALUE "OriginalFilename", "rufus-3.19.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.19.1894" VALUE "ProductVersion", "3.19.1895"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"