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

Fix GRUB boot directory (#2408)

This commit is contained in:
codefiles 2024-03-11 14:38:10 -04:00 committed by GitHub
parent c210cdcb8f
commit 613bec6562
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
archinstall/lib/installer.py
View File

@ -919,12 +919,7 @@ class Installer:
info(f"GRUB boot partition: {boot_partition.dev_path}") info(f"GRUB boot partition: {boot_partition.dev_path}")
if boot_partition == root_partition and root_partition.mountpoint: boot_dir = Path('/boot')
boot_dir = root_partition.mountpoint / 'boot'
elif boot_partition.mountpoint:
boot_dir = boot_partition.mountpoint
else:
raise ValueError('Could not detect boot directory')
command = [ command = [
'/usr/bin/arch-chroot', '/usr/bin/arch-chroot',
@ -942,8 +937,9 @@ class Installer:
self.pacman.strap('efibootmgr') # TODO: Do we need? Yes, but remove from minimal_installation() instead? self.pacman.strap('efibootmgr') # TODO: Do we need? Yes, but remove from minimal_installation() instead?
boot_dir_arg = [] boot_dir_arg = []
if boot_partition != efi_partition: if boot_partition.mountpoint and boot_partition.mountpoint != boot_dir:
boot_dir_arg.append(f'--boot-directory={boot_dir}') boot_dir_arg.append(f'--boot-directory={boot_partition.mountpoint}')
boot_dir = boot_partition.mountpoint
add_options = [ add_options = [
'--target=x86_64-efi', '--target=x86_64-efi',