Merge pull request #705 from yoheiueda/enable-s390x

install: Support the s390x architecture
containers · Jul 18, 2024 · 934cc88 · 934cc88
2 parents 091840b + 9cf239b
commit 934cc88
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/lib/src/install.rs b/lib/src/install.rs
@@ -1101,10 +1101,6 @@ async fn prepare_install(
     crate::cli::require_root()?;
     require_host_pidns()?;
 
-    if cfg!(target_arch = "s390x") {
-        anyhow::bail!("Installation is not supported on this architecture yet");
-    }
-
     let rootfs = cap_std::fs::Dir::open_ambient_dir("/", cap_std::ambient_authority())
         .context("Opening /")?;
 

diff --git a/lib/src/install/baseline.rs b/lib/src/install/baseline.rs
@@ -254,8 +254,6 @@ pub(crate) fn install_create_rootfs(
             "BIOS-BOOT",
             Some("21686148-6449-6E6F-744E-656564454649"),
         );
-    } else if cfg!(target_arch = "aarch64") {
-        // Only UEFI here for now
     } else if cfg!(target_arch = "powerpc64") {
         // PowerPC-PReP-boot
         partno += 1;
@@ -266,6 +264,8 @@ pub(crate) fn install_create_rootfs(
             crate::bootloader::PREPBOOT_LABEL,
             Some(crate::bootloader::PREPBOOT_GUID),
         );
+    } else if cfg!(any(target_arch = "aarch64", target_arch = "s390x")) {
+        // No bootloader partition is necessary
     } else {
         anyhow::bail!("Unsupported architecture: {}", std::env::consts::ARCH);
     }