TrueNAS/scale-build
1
0
Fork 0
mirror of https://github.com/truenas/scale-build.git synced 2025-12-20 10:59:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix GRUB upgrade for systems missing BIOS partition with variable EFI

Browse Source
This commit is contained in:
Ameer Hamza
2025-08-29 23:29:57 +05:00
parent b5400c09c9
commit 79885c5d08
1 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
truenas_install/__main__.py
View File

@@ -51,6 +51,7 @@ from .utils import getmntinfo, get_pids # noqa
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
BIOS_BOOT_PARTITION_GUID = "21686148-6449-6E6F-744E-656564454649"
EFI_SYSTEM_PARTITION_GUID = "C12A7328-F81F-11D2-BA4B-00A0C93EC93B" EFI_SYSTEM_PARTITION_GUID = "C12A7328-F81F-11D2-BA4B-00A0C93EC93B"
RE_UNSQUASHFS_PROGRESS = re.compile(r"\[.+]\s+(?P<extracted>[0-9]+)/(?P<total>[0-9]+)\s+(?P<progress>[0-9]+)%") RE_UNSQUASHFS_PROGRESS = re.compile(r"\[.+]\s+(?P<extracted>[0-9]+)/(?P<total>[0-9]+)\s+(?P<progress>[0-9]+)%")
@@ -606,11 +607,37 @@ def main():
os.makedirs(f"{root}/boot/efi", exist_ok=True) os.makedirs(f"{root}/boot/efi", exist_ok=True)
for i, disk in enumerate(disks): for i, disk in enumerate(disks):
efi_partition_number = 2 if old_root is None:
# Fresh installation - we know the layout
efi_partition_number = 2
run_command([
"chroot", root, "grub-install", "--target=i386-pc", f"/dev/{disk}"
])
else:
partition_1_guid = None
try:
partition_1_guid = get_partition_guid(disk, 1)
except Exception:
pass
run_command([ if partition_1_guid == BIOS_BOOT_PARTITION_GUID:
"chroot", root, "grub-install", "--target=i386-pc", f"/dev/{disk}" run_command([
]) "chroot", root, "grub-install", "--target=i386-pc", f"/dev/{disk}"
])
# EFI partition: position 2 (SCALE) or 1 (Core migrations)
efi_partition_number = None
if partition_1_guid == EFI_SYSTEM_PARTITION_GUID:
efi_partition_number = 1
else:
try:
if get_partition_guid(disk, 2) == EFI_SYSTEM_PARTITION_GUID:
efi_partition_number = 2
except Exception:
pass
if efi_partition_number is None:
continue
if get_partition_guid(disk, efi_partition_number) != EFI_SYSTEM_PARTITION_GUID: if get_partition_guid(disk, efi_partition_number) != EFI_SYSTEM_PARTITION_GUID:
continue continue