diff --git a/iridium_installer/backend/os_install.py b/iridium_installer/backend/os_install.py index 8a01116..49828fb 100644 --- a/iridium_installer/backend/os_install.py +++ b/iridium_installer/backend/os_install.py @@ -76,10 +76,10 @@ def run_command(cmd, check=True): @contextmanager def mount_pseudo_fs(mount_root): """ - Context manager to bind mount /dev, /proc, /sys, /run, and efivarfs into mount_root. + Context manager to bind mount /dev, /proc, /sys, and efivarfs into mount_root. """ logger.info(f"Mounting pseudo-filesystems to {mount_root}...") - mounts = ["dev", "proc", "sys", "run"] + mounts = ["dev", "proc", "sys"] mounted_paths = [] try: @@ -230,7 +230,7 @@ def install_minimal_os(mount_root, releasever=None): "coreutils", "kernel", "systemd", - "systemd-boot", + "systemd-boot-unsigned", "dnf", "shadow-utils", "util-linux", @@ -251,6 +251,7 @@ def install_minimal_os(mount_root, releasever=None): f"--repofrompath=iridium-iso,{iso_repo}", "--enablerepo=iridium-iso", "--nogpgcheck", + "--cacheonly", "--setopt=iridium-iso.gpgcheck=0", "--setopt=metadata_expire=-1", ] @@ -270,11 +271,13 @@ def install_minimal_os(mount_root, releasever=None): "-y", f"--installroot={mount_root}", f"--releasever={releasever}", - "--use-host-config", "--setopt=install_weak_deps=False", "--nodocs", ] + if not iso_repo: + cmd.append("--use-host-config") + cmd += dnf_args + packages with mount_pseudo_fs(mount_root):