RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix GRUB fallback-from-removable logic introduced in c095eb56d8 (#3950) 

Commit c095eb56d8 was supposed to introduce logic
such that if the `grub-install` command failed with a `--removable` flag, then
another attempt would be made with such flag removed.

This was broken because the `--removable` flag was kept in both cases (likely a
copy-paste mistake). This has been an issue since, in all future iterations of
the code.

What this commit does is fix this logic, but also invert the cases tested:
first test without `--removable`, then add it should that case fail, as this is
the most sensible thing to do.
This commit is contained in:
Mintsuki 2025-11-29 01:10:04 +01:00 committed by GitHub
parent 7732d50016
commit 6fc0bc3671
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
archinstall/lib/installer.py
View File

@ -1320,11 +1320,15 @@ class Installer:
try:
SysCommand(command, peek_output=True)
except SysCallError:
try:
SysCommand(command, peek_output=True)
except SysCallError as err:
raise DiskError(f'Could not install GRUB to {self.target}{efi_partition.mountpoint}: {err}')
except SysCallError as err:
if not bootloader_removable:
command.append('--removable')
try:
SysCommand(command, peek_output=True)
except SysCallError:
pass
raise DiskError(f'Could not install GRUB to {self.target}{efi_partition.mountpoint}: {err}') from err
else:
info(f'GRUB boot partition: {boot_partition.dev_path}')