nerd
/
rufus
mirror of https://github.com/pbatard/rufus.git
1
1
Fork 0
Code Issues 1 Projects Releases Wiki Activity

[grub] add workaround for openSUSE Live ISOs 

* In their great wisdom, the openSUSE maintainers added a 'set linux=linux'
  line to their grub.cfg, which means that their kernel option token is no
  longer 'linux' but '$linux'... and we have to add a workaround for that.
This commit is contained in:
Pete Batard 2021-07-29 18:37:59 +01:00
parent 94a2789296
commit 723b6c98a2
No known key found for this signature in database
GPG Key ID: 38E0CF5E69EDD671
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.txt
View File

@ -1,6 +1,7 @@
o Version 3.15 (2021.08.??)
Update GRUB to version 2.06
Add support for .vtsi files (Ventoy Sparse Image, courtesy of longpanda/ventoy)
Add workaround for openSUSE Live ISOs
Move default app directory to %LocalAppData%\Rufus\ and always save a log there on exit
Fix AppStore version of Rufus not being able to store downloaded files
Fix failure to open Syslinux/GRUB files when Rufus is located at the root of a drive

2
res/appstore/Package.appxmanifest
View File

@ -11,7 +11,7 @@
<Identity
Name="19453.net.Rufus"
Publisher="CN=7AC86D13-3E5A-491A-ADD5-80095C212740"
Version="3.15.1808.0" />
Version="3.15.1809.0" />
<Properties>
<DisplayName>Rufus</DisplayName>

6
src/iso.c
View File

@ -353,7 +353,11 @@ static void fix_config(const char* psz_fullpath, const char* psz_path, const cha
if (props->is_grub_cfg) {
// Older versions of GRUB EFI used "linuxefi", newer just use "linux"
if ((replace_in_token_data(src, "linux", iso_label, usb_label, TRUE) != NULL) ||
(replace_in_token_data(src, "linuxefi", iso_label, usb_label, TRUE) != NULL)) {
(replace_in_token_data(src, "linuxefi", iso_label, usb_label, TRUE) != NULL) ||
// In their great wisdom, the openSUSE maintainers added a 'set linux=linux'
// line to their grub.cfg, which means that their kernel option token is no
// longer 'linux' but '$linux'... and we have to add a workaround for that.
(replace_in_token_data(src, "$linux", iso_label, usb_label, TRUE) != NULL)) {
uprintf(" Patched %s: '%s' ➔ '%s'\n", src, iso_label, usb_label);
modified = TRUE;
}

10
src/rufus.rc
View File

@ -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 3.15.1808"
CAPTION "Rufus 3.15.1809"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@ -395,8 +395,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,15,1808,0
PRODUCTVERSION 3,15,1808,0
FILEVERSION 3,15,1809,0
PRODUCTVERSION 3,15,1809,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -414,13 +414,13 @@ BEGIN
VALUE "Comments", "https://rufus.ie"
VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "3.15.1808"
VALUE "FileVersion", "3.15.1809"
VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2021 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
VALUE "OriginalFilename", "rufus-3.15.exe"
VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.15.1808"
VALUE "ProductVersion", "3.15.1809"
END
END
BLOCK "VarFileInfo"