Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib/installer.py
diff options
context:
space:
mode:
authorcodefiles <11915375+codefiles@users.noreply.github.com>2023-09-29 10:09:28 -0400
committerGitHub <noreply@github.com>2023-09-29 16:09:28 +0200
commit9f5c2bb70b0a4551eaa871164a3c9d71c1e65086 (patch)
tree551c839fcef46bb9cd60440a3edfef3b58da4ace /archinstall/lib/installer.py
parent5f5b95f24515de0d265a96e6919622d185f10fa3 (diff)
Add support for ESP partition flag (#2133)
Diffstat (limited to 'archinstall/lib/installer.py')
-rw-r--r--archinstall/lib/installer.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index e7895a1a..585389ed 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -903,15 +903,22 @@ class Installer:
'--debug'
]
- if SysInfo.has_uefi() and efi_partition is not None:
+ if SysInfo.has_uefi():
+ if not efi_partition:
+ raise ValueError('Could not detect efi partition')
+
info(f"GRUB EFI partition: {efi_partition.dev_path}")
self.pacman.strap('efibootmgr') # TODO: Do we need? Yes, but remove from minimal_installation() instead?
+ boot_dir_arg = []
+ if boot_partition != efi_partition:
+ boot_dir_arg.append(f'--boot-directory={boot_dir}')
+
add_options = [
'--target=x86_64-efi',
f'--efi-directory={efi_partition.mountpoint}',
- f'--boot-directory={boot_dir}',
+ *boot_dir_arg,
'--bootloader-id=GRUB',
'--removable'
]