Skip to content

Commit

Permalink
Ignore 'firmware_bootnum' Stanzas
Browse files Browse the repository at this point in the history
  • Loading branch information
dakanji committed Mar 2, 2021
1 parent 617eaea commit a760dbf
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 23 deletions.
17 changes: 10 additions & 7 deletions MainLoader/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -1287,13 +1287,16 @@ LOADER_ENTRY * AddStanzaEntries (
Entry->Enabled = FALSE;
}
else if (MyStriCmp(TokenList[0], L"firmware_bootnum") && (TokenCount > 1)) {
Entry->EfiBootNum = StrToHex(TokenList[1], 0, 16);
Entry->EfiLoaderPath = NULL;
Entry->LoaderPath = NULL;
MyFreePool(Entry->me.Title);
Entry->me.Title = StrDuplicate(Title);
Entry->me.BadgeImage = BuiltinIcon(BUILTIN_ICON_VOL_EFI);
Entry->me.Tag = TAG_FIRMWARE_LOADER;
// DA-TAG: Getting funnies when this is enabled.
// Disable until properly investigated
Entry->Enabled = FALSE;
//Entry->EfiBootNum = StrToHex(TokenList[1], 0, 16);
//Entry->EfiLoaderPath = NULL;
//Entry->LoaderPath = NULL;
//MyFreePool(Entry->me.Title);
//Entry->me.Title = StrDuplicate(Title);
//Entry->me.BadgeImage = BuiltinIcon(BUILTIN_ICON_VOL_EFI);
//Entry->me.Tag = TAG_FIRMWARE_LOADER;
}
else if (MyStriCmp (TokenList[0], L"submenuentry") && (TokenCount > 1)) {
AddSubmenu (Entry, File, CurrentVolume, TokenList[1]);
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ While RefindPlus will function with the rEFInd configuration file, `refind.conf`
Note that if you run RefindPlus without activating the additonal options, as will be the case if using an unmodified rEFInd configuration file, a RefindPlus run will be equivalent to running the rEFInd version it is based on, currently v0.13.1. That is, the additonal options provided in RefindPlus must be actively enabled if they are required.

Configuration differences between the rEFInd and RefindPlus implementations as at rEFInd v0.13.1 are:
- `firmware_bootnum`: Manual Stanzas with this token are ignored by RefindPlus due to reliability issues.
- `write_systemd_vars`: Systemd EFI variables are not written unless specifically set to do so by activating this configuration token.
- `use_nvram`: Application variables are written to the `vars` folder on the file system instead of to the motherboard's NVRAM unless specifically set to do so by activating this configuration token.
- `resolution`: The `max` setting is ignored as the maximum available resolution is automatically used by default by RefindPlus when required.
Expand Down
16 changes: 0 additions & 16 deletions config.conf-sample
Original file line number Diff line number Diff line change
Expand Up @@ -927,19 +927,3 @@ menuentry "My Mac OS" {
loader \System\Library\CoreServices\boot.efi
disabled
}

# The firmware_bootnum token takes a HEXADECIMAL value as an option
# and sets that value using the EFI's BootNext variable and then
# reboots the computer. This then causes a one-time boot of the
# computer using this EFI boot option. It can be used for various
# purposes, but one that's likely to interest some rEFInd users is
# that some Macs with HiDPI displays produce lower-resolution
# desktops when booted through rEFInd than when booted via Apple's
# own boot manager. Booting using the firmware_bootnum option
# produces the better resolution. Note that no loader option is
# used in this type of configuration.
menuentry "macOS via BootNext" {
icon /EFI/refind/icons/os_mac.png
firmware_bootnum 80
disabled
}

0 comments on commit a760dbf

Please sign in to comment.