TrueNAS/scale-build
1
0
Fork 0
mirror of https://github.com/truenas/scale-build.git synced 2026-02-15 07:29:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure grub binary is updated on ESP if grub version changed (#854)

Browse Source
This commit is contained in:
sonicaj
2025-05-12 16:36:24 +05:00
committed by GitHub
parent 6aca689d62
commit c6ba53c7e5
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
truenas_install/__main__.py
View File

@@ -570,8 +570,16 @@ def main():
# We would like to configure fips bit as well here # We would like to configure fips bit as well here
write_progress(0.95, "Configuring FIPS") write_progress(0.95, "Configuring FIPS")
run_command(["chroot", root, "/usr/bin/configure_fips"]) run_command(["chroot", root, "/usr/bin/configure_fips"])
run_grub_install = old_root is None
if run_grub_install is False:
# We will check if current BE has a different version of grub then the new/upcoming one
# and if that is the case, we want to update ESP with newer grub binaries
cp = run_command(["grub-install", "--version"])
be_cp = run_command(["chroot", root, "grub-install", "--version"])
# We expect something like "grub-install (GRUB) 2.12-1~bpo12+1"
run_grub_install = cp.stdout.strip().split()[-1] != be_cp.stdout.strip().split()[-1]
if old_root is None: if run_grub_install:
write_progress(0.96, "Installing GRUB") write_progress(0.96, "Installing GRUB")
if os.path.exists("/sys/firmware/efi"): if os.path.exists("/sys/firmware/efi"):
@@ -621,6 +629,8 @@ def main():
"-l", "/EFI/debian/grubx64.efi"]) "-l", "/EFI/debian/grubx64.efi"])
finally: finally:
run_command(["chroot", root, "umount", "/boot/efi"]) run_command(["chroot", root, "umount", "/boot/efi"])
else:
write_progress(0.96, "No need to update grub in ESP")
finally: finally:
for cmd in reversed(undo): for cmd in reversed(undo):
run_command(cmd) run_command(cmd)