Skip to content

Commit

Permalink
install: Do use zipl on s390x
Browse files Browse the repository at this point in the history
This pairs with
ostreedev/ostree@e3d93a8

What we need to add is something more like
`ostree admin init-fs --edition=2023` that flips on modern defaults.
  • Loading branch information
cgwalters committed Sep 29, 2023
1 parent 0917560 commit 9d54d17
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion lib/src/install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,17 @@ async fn initialize_ostree_root_from_self(
["admin", "init-fs", "--modern", rootfs.as_str()],
)?;

for (k, v) in [("sysroot.bootloader", "none"), ("sysroot.readonly", "true")] {
// Default to avoiding grub2-mkconfig etc., but we need to use zipl on s390x.
// TODO: Lower this logic into ostree proper.
let bootloader = if cfg!(target_arch = "s390x") {
"zipl"
} else {
"none"
};
for (k, v) in [
("sysroot.bootloader", bootloader),
("sysroot.readonly", "true"),
] {
Task::new("Configuring ostree repo", "ostree")
.args(["config", "--repo", "ostree/repo", "set", k, v])
.cwd(rootfs_dir)?
Expand Down

0 comments on commit 9d54d17

Please sign in to comment.