-
Notifications
You must be signed in to change notification settings - Fork 670
Make removable location the default for bootloader installation #4030
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -83,8 +83,8 @@ def _prev_uki(self, item: MenuItem) -> str | None: | |
|
|
||
| def _prev_removable(self, item: MenuItem) -> str | None: | ||
| if item.value: | ||
| return tr('Will install to /EFI/BOOT/ (removable location)') | ||
| return tr('Will install to standard location with NVRAM entry') | ||
| return tr('Will install to /EFI/BOOT/ (removable location, safe default)') | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. And we can keep the hints that help users choose |
||
| return tr('Will install to custom location with NVRAM entry') | ||
|
|
||
| @override | ||
| def run( | ||
|
|
@@ -114,6 +114,9 @@ def _select_bootloader(self, preset: Bootloader | None) -> Bootloader | None: | |
| removable_item.value = False | ||
| self._bootloader_conf.removable = False | ||
| else: | ||
| if not removable_item.enabled: | ||
| removable_item.value = True | ||
| self._bootloader_conf.removable = True | ||
| removable_item.enabled = True | ||
|
|
||
| return bootloader | ||
|
|
@@ -147,18 +150,26 @@ def _select_removable(self, preset: bool) -> bool: | |
| + '\n\n' | ||
| + tr('This installs the bootloader to /EFI/BOOT/BOOTX64.EFI (or similar) which is useful for:') | ||
| + '\n\n • ' | ||
| + tr('Firmware that does not properly support NVRAM boot entries like most MSI motherboards,') | ||
| + '\n ' | ||
| + tr('most Apple Macs, many laptops...') | ||
| + '\n • ' | ||
| + tr('USB drives or other portable external media.') | ||
| + '\n • ' | ||
| + tr('Systems where you want the disk to be bootable on any computer.') | ||
| + '\n • ' | ||
| + tr('Firmware that does not properly support NVRAM boot entries.') | ||
| + '\n\n' | ||
| + tr( | ||
| textwrap.dedent( | ||
| """\ | ||
| This is NOT recommended if none of the above apply, as it makes installing multiple | ||
| EFI bootloaders on the same disk more challenging, and it overwrites whatever bootloader | ||
| was previously installed on the default removable media search location, if any. | ||
| If you do not know what this means, LEAVE THIS OPTION ENABLED, as it is the safe default. | ||
|
|
||
| It is suggested to disable this if none of the above apply, as it makes installing multiple | ||
| EFI bootloaders on the same disk easier, and it will not overwrite whatever bootloader | ||
| was previously installed at the default removable media search location, if any. | ||
|
|
||
| It may also make the installation more resilient in case of dual-booting with Windows, | ||
| as Windows is known to sometimes erase or replace the bootloader installed at the removable | ||
| location. | ||
| """ | ||
| ) | ||
| ) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.