Iridium/installer
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix UEFI GRUB installation: ensure ESP is mounted to /boot/efi and improve error logging

Browse Source
This commit is contained in:
N0VA
2026-02-09 16:53:30 +01:00
parent cbc1b05eca
commit 0ec7de3937
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
iridium_installer/backend/os_install.py
View File

@@ -66,6 +66,8 @@ def run_command(cmd, check=True):
stderr_str = "".join(stderr_lines) stderr_str = "".join(stderr_lines)
if check and returncode != 0: if check and returncode != 0:
error_msg = f"Command '{' '.join(cmd)}' failed with exit code {returncode}\nStderr: {stderr_str}"
log_to_discord("ERROR", error_msg, module="os_install")
raise subprocess.CalledProcessError( raise subprocess.CalledProcessError(
returncode, cmd, output=stdout_str, stderr=stderr_str returncode, cmd, output=stdout_str, stderr=stderr_str
) )
@@ -95,7 +97,8 @@ def mount_pseudo_fs(mount_root):
target = os.path.join(mount_root, "sys/firmware/efi/efivars") target = os.path.join(mount_root, "sys/firmware/efi/efivars")
os.makedirs(target, exist_ok=True) os.makedirs(target, exist_ok=True)
try: try:
run_command(["mount", "-t", "efivarfs", "efivarfs", target]) # Use --bind if already mounted, or mount -t efivarfs
run_command(["mount", "--bind", efivars_path, target])
mounted_paths.append(target) mounted_paths.append(target)
except Exception as e: except Exception as e:
logger.warning(f"Failed to mount efivarfs: {e}") logger.warning(f"Failed to mount efivarfs: {e}")
@@ -241,6 +244,15 @@ def configure_system(mount_root, partition_info, user_info=None, disk_device=Non
with open(os.path.join(mount_root, "etc/fstab"), "w") as f: with open(os.path.join(mount_root, "etc/fstab"), "w") as f:
f.write("\n".join(fstab_lines) + "\n") f.write("\n".join(fstab_lines) + "\n")
# Ensure EFI is mounted for GRUB installation
if uefi and partition_info.get("efi"):
efi_target = os.path.join(mount_root, "boot/efi")
os.makedirs(efi_target, exist_ok=True)
# Check if already mounted
res = subprocess.run(["mount"], capture_output=True, text=True)
if efi_target not in res.stdout:
run_command(["mount", partition_info["efi"], efi_target])
with mount_pseudo_fs(mount_root): with mount_pseudo_fs(mount_root):
# 2. Configure User # 2. Configure User
if user_info: if user_info:
@@ -295,4 +307,4 @@ def configure_system(mount_root, partition_info, user_info=None, disk_device=Non
run_command(["sync"]) run_command(["sync"])
logger.info("System configuration complete.") logger.info("System configuration complete.")
log_os_install("CONFIGURE", "complete", "systemd-boot and user configured successfully") log_os_install("CONFIGURE", "complete", "GRUB2 and user configured successfully")