Skip to content

Commit

Permalink
platform/metal: don't set console key on s390x
Browse files Browse the repository at this point in the history
Otherwise, coreos-installer will look for a GRUB config even though
one does not exist.[[1]] Anyway, it seems like we don't need to change
anything on s390x since looking at the testiso logs, one can see that
`console.txt` does contain all the logs already. So don't even bother
setting a karg instead.

Follow-up to 694f96f ("platform/metal: set serial console in PXE and
ISO tests").

[1]: coreos/coreos-installer#1171
  • Loading branch information
jlebon committed Apr 20, 2023
1 parent a8bfe8f commit 026e0f3
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions mantle/platform/metal.go
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,10 @@ func (inst *Install) PXE(kargs []string, liveIgnition, ignition conf.Conf, offli
}
mode := 0644

liveIgnition.AddFile("/etc/coreos/installer.d/mantle.yaml", string(installerConfigData), mode)
// XXX: https://github.com/coreos/coreos-installer/issues/1171
if coreosarch.CurrentRpmArch() != "s390x" {
liveIgnition.AddFile("/etc/coreos/installer.d/mantle.yaml", string(installerConfigData), mode)
}

inst.kargs = kargs
inst.ignition = ignition
Expand Down Expand Up @@ -604,7 +607,11 @@ func (inst *Install) InstallViaISOEmbed(kargs []string, liveIgnition, targetIgni
installerConfig := installerConfig{
IgnitionFile: "/var/opt/pointer.ign",
DestDevice: "/dev/vda",
Console: []string{consoleKernelArgument[coreosarch.CurrentRpmArch()]},
}

// XXX: https://github.com/coreos/coreos-installer/issues/1171
if coreosarch.CurrentRpmArch() != "s390x" {
installerConfig.Console = []string{consoleKernelArgument[coreosarch.CurrentRpmArch()]}
}

if inst.MultiPathDisk {
Expand Down

0 comments on commit 026e0f3

Please sign in to comment.