From 89c1f8a72cbd6783391b741bbd651021c0c9ad27 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Thu, 9 Nov 2023 18:06:06 +0000 Subject: [PATCH] [iso] add BIOS support for Artix Linux * Unfortunately, the Artix maintainers decided *NOT* to include the fat GRUB module for UEFI, so this will only work for BIOS boot... --- src/iso.c | 3 ++- src/rufus.rc | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/iso.c b/src/iso.c index 7f7535e1..cac0ab1a 100644 --- a/src/iso.c +++ b/src/iso.c @@ -394,9 +394,10 @@ static void fix_config(const char* psz_fullpath, const char* psz_path, const cha //'linux' but '$linux'... and we have to add a workaround for that. // Then, newer Arch and derivatives added an extra "search --label ..." command // in their GRUB conf, which we need to cater for in supplement of the kernel line. + // Then Artix called in and decided they would use a "for kopt ..." loop. // Finally, we're just shoving the known isolinux/syslinux tokens in there to process // all config files equally. - static const char* cfg_token[] = { "options", "append", "linux", "linuxefi", "$linux", "search" }; + static const char* cfg_token[] = { "options", "append", "linux", "linuxefi", "$linux", "search", "for"}; iso_label = replace_char(img_report.label, ' ', "\\x20"); usb_label = replace_char(img_report.usb_label, ' ', "\\x20"); if ((iso_label != NULL) && (usb_label != NULL)) { diff --git a/src/rufus.rc b/src/rufus.rc index d1316992..d2909e36 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 232, 326 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_ACCEPTFILES -CAPTION "Rufus 4.4.2092" +CAPTION "Rufus 4.4.2093" FONT 9, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP @@ -392,8 +392,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,4,2092,0 - PRODUCTVERSION 4,4,2092,0 + FILEVERSION 4,4,2093,0 + PRODUCTVERSION 4,4,2093,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -411,13 +411,13 @@ BEGIN VALUE "Comments", "https://rufus.ie" VALUE "CompanyName", "Akeo Consulting" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "4.4.2092" + VALUE "FileVersion", "4.4.2093" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2023 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" VALUE "OriginalFilename", "rufus-4.4.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "4.4.2092" + VALUE "ProductVersion", "4.4.2093" END END BLOCK "VarFileInfo"