Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

install: Support the s390x architecture #705

Merged
merged 2 commits into from
Jul 18, 2024
Merged

install: Support the s390x architecture #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
641094f
install: Add support for s390x architecture
yoheiueda Jul 1, 2024
9cf239b
Remove s390s check
yoheiueda Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions lib/src/install.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 /")?;

Expand Down
4 changes: 2 additions & 2 deletions lib/src/install/baseline.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
}
Expand Down