install: Do use zipl on s390x

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. Signed-off-by: Colin Walters <[email protected]>
containers · Sep 29, 2023 · 5c30510 · 5c30510
1 parent 0917560
commit 5c30510
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/lib/src/install.rs b/lib/src/install.rs
@@ -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)?