Skip to content

Commit

Permalink
repo: Default bootloader to zipl on s390x
Browse files Browse the repository at this point in the history
This will allow us to drop code like
https://github.com/coreos/coreos-assembler/blob/87fc693c115eae1e7ff0e1621ce26c9167af6e84/src/create_disk.sh#L503
which is really just unnecessary since there aren't any other
bootloaders we care about on this architecture.
  • Loading branch information
cgwalters committed Sep 27, 2023
1 parent 13be078 commit 8812340
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/libostree/ostree-repo.c
Original file line number Diff line number Diff line change
Expand Up @@ -3298,9 +3298,14 @@ static gboolean
reload_sysroot_config (OstreeRepo *self, GCancellable *cancellable, GError **error)
{
g_autofree char *bootloader = NULL;
#if !defined(__s390x__)
const char *default_bootloader = "auto";
#else
const char *default_bootloader = "zipl";
#endif

if (!ot_keyfile_get_value_with_default_group_optional (self->config, "sysroot", "bootloader",
"auto", &bootloader, error))
default_bootloader, &bootloader, error))
return FALSE;

/* TODO: possibly later add support for specifying a generic bootloader
Expand Down

0 comments on commit 8812340

Please sign in to comment.