From 21d2c78f200ff604f1d85f8b3829c212fce5ee75 Mon Sep 17 00:00:00 2001 From: Achilleas Koutsou Date: Wed, 17 Aug 2022 19:42:22 +0200 Subject: [PATCH] manifest: remove s390x case from OSTreeDeployment Not supported. No need to switch. --- internal/manifest/commit_deployment.go | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/internal/manifest/commit_deployment.go b/internal/manifest/commit_deployment.go index 86fa11524..7d344499b 100644 --- a/internal/manifest/commit_deployment.go +++ b/internal/manifest/commit_deployment.go @@ -150,20 +150,13 @@ func (p *OSTreeDeployment) serialize() osbuild.Pipeline { // TODO: Add users? // NOTE: Users can be embedded in a commit, but we should also support adding them at deploy time. - var bootloader *osbuild.Stage - switch p.platform.GetArch() { - case platform.ARCH_S390X: - bootloader = osbuild.NewZiplStage(new(osbuild.ZiplStageOptions)) - default: - options := osbuild.NewGrub2StageOptionsUnified(p.PartitionTable, - "", - p.platform.GetUEFIVendor() != "", - p.platform.GetBIOSPlatform(), - p.platform.GetUEFIVendor(), true) - options.Greenboot = true - bootloader = osbuild.NewGRUB2Stage(options) - } - + options := osbuild.NewGrub2StageOptionsUnified(p.PartitionTable, + "", + p.platform.GetUEFIVendor() != "", + p.platform.GetBIOSPlatform(), + p.platform.GetUEFIVendor(), true) + options.Greenboot = true + bootloader := osbuild.NewGRUB2Stage(options) pipeline.AddStage(bootloader) pipeline.AddStage(osbuild.NewOSTreeSelinuxStage(