nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

[iso] disable ISO mode for incompatible Manjaro

Browse source
This commit is contained in:
Pete Batard 2019-07-03 23:07:24 +01:00
parent 3c1ef23ff3
commit 180e6d4364
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
4 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/iso.c
View file

@ -91,6 +91,7 @@ static const char* pe_file[] = { "ntdetect.com", "setupldr.bin", "txtsetup.sif"
static const char* reactos_name = "setupldr.sys"; // TODO: freeldr.sys doesn't seem to work static const char* reactos_name = "setupldr.sys"; // TODO: freeldr.sys doesn't seem to work
static const char* kolibri_name = "kolibri.img"; static const char* kolibri_name = "kolibri.img";
static const char* autorun_name = "autorun.inf"; static const char* autorun_name = "autorun.inf";
static const char* manjaro_marker = ".miso";
static const char* stupid_antivirus = " NOTE: This is usually caused by a poorly designed security solution. " static const char* stupid_antivirus = " NOTE: This is usually caused by a poorly designed security solution. "
"See https://goo.gl/QTobxX.\r\n This file will be skipped for now, but you should really " "See https://goo.gl/QTobxX.\r\n This file will be skipped for now, but you should really "
"look into using a *SMARTER* antivirus solution."; "look into using a *SMARTER* antivirus solution.";
@ -201,6 +202,9 @@ static BOOL check_iso_props(const char* psz_dirname, int64_t file_length, const
if (safe_stricmp(psz_basename, bootmgr_efi_name) == 0) { if (safe_stricmp(psz_basename, bootmgr_efi_name) == 0) {
img_report.has_efi |= 1; img_report.has_efi |= 1;
} }
if (safe_stricmp(psz_basename, manjaro_marker) == 0) {
img_report.disable_iso = TRUE;
}
} }
// Check for ReactOS' setupldr.sys anywhere // Check for ReactOS' setupldr.sys anywhere

5
src/rufus.c
View file

@ -1103,8 +1103,9 @@ DWORD WINAPI ISOScanThread(LPVOID param)
if (img_report.is_iso) { if (img_report.is_iso) {
DisplayISOProps(); DisplayISOProps();
// If we have an ISOHybrid, but without an ISO method we support, disable ISO support altogether // If we have an ISOHybrid, but without an ISO method we support, disable ISO support altogether
if (IS_DD_BOOTABLE(img_report) && !IS_BIOS_BOOTABLE(img_report) && !IS_EFI_BOOTABLE(img_report)) { if (IS_DD_BOOTABLE(img_report) && (img_report.disable_iso ||
uprintf("This ISOHybrid is not compatible with any of the ISO boot methods we support"); (!IS_BIOS_BOOTABLE(img_report) && !IS_EFI_BOOTABLE(img_report)))) {
uprintf("Note: ISO mode will be disabled because this ISOHybrid is not compatible with ISO boot.");
img_report.is_iso = FALSE; img_report.is_iso = FALSE;
} }
selection_default = BT_IMAGE; selection_default = BT_IMAGE;

1
src/rufus.h
View file

@ -341,6 +341,7 @@ typedef struct {
BOOLEAN uses_minint; BOOLEAN uses_minint;
BOOLEAN compression_type; BOOLEAN compression_type;
BOOLEAN is_vhd; BOOLEAN is_vhd;
BOOLEAN disable_iso;
uint16_t sl_version; // Syslinux/Isolinux version uint16_t sl_version; // Syslinux/Isolinux version
char sl_version_str[12]; char sl_version_str[12];
char sl_version_ext[32]; char sl_version_ext[32];

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.6.1543" CAPTION "Rufus 3.6.1544"
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
@ -394,8 +394,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,6,1543,0 FILEVERSION 3,6,1544,0
PRODUCTVERSION 3,6,1543,0 PRODUCTVERSION 3,6,1544,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -413,13 +413,13 @@ BEGIN
VALUE "Comments", "https://akeo.ie" VALUE "Comments", "https://akeo.ie"
VALUE "CompanyName", "Akeo Consulting" VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "3.6.1543" VALUE "FileVersion", "3.6.1544"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2019 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2019 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html" VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus-3.6.exe" VALUE "OriginalFilename", "rufus-3.6.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.6.1543" VALUE "ProductVersion", "3.6.1544"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"