Skip to content

Commit 9ef3330

Browse files
mvo5supakeen
authored andcommitted
image: tweak kernel isotree cmdline args
This commit allows adding kernel commandline options to the AnacondaContainerInstaller and also tweak the existing options. Now that tests can append them we can drop e.g. `console=ttyS0`.
1 parent acb6e9e commit 9ef3330

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

pkg/image/anaconda_container_installer.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,18 +113,19 @@ func (img *AnacondaContainerInstaller) InstantiateManifestFromContainer(m *manif
113113
img.Kickstart.Path = osbuild.KickstartPathOSBuild
114114
}
115115

116-
bootTreePipeline.KernelOpts = []string{
116+
kernelOpts := []string{
117117
fmt.Sprintf("inst.stage2=hd:LABEL=%s", img.InstallerCustomizations.ISOLabel),
118118
fmt.Sprintf("inst.ks=hd:LABEL=%s:%s", img.InstallerCustomizations.ISOLabel, img.Kickstart.Path),
119-
// XXX: allow this to be configured
119+
"console=tty0",
120+
// XXX: we want the graphical installer eventually, just
121+
// need to figure out the dependencies
120122
"inst.text",
121-
// last console is what anaconda uses to disply its
122-
// content, should we switch to tty0 by default here?
123-
"console=tty0", "console=ttyS0",
124123
}
125124
if anacondaPipeline.InstallerCustomizations.FIPS {
126-
bootTreePipeline.KernelOpts = append(bootTreePipeline.KernelOpts, "fips=1")
125+
kernelOpts = append(kernelOpts, "fips=1")
127126
}
127+
kernelOpts = append(kernelOpts, img.InstallerCustomizations.KernelOptionsAppend...)
128+
bootTreePipeline.KernelOpts = kernelOpts
128129

129130
isoTreePipeline := manifest.NewAnacondaInstallerISOTree(buildPipeline, anacondaPipeline, rootfsImagePipeline, bootTreePipeline)
130131
isoTreePipeline.PartitionTable = efiBootPartitionTable(rng)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
db1d78a5248c7e7e84d1488d7315537886b95c6a
1+
0e5ba8dd30f80a431cf48405a7ff84eab6cc7a96
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6b8edec55f3154037ab6300c776105ffb83d0fdc
1+
57a85fa7b71308ed92a9d2ba6acac2fef1fa6559

0 commit comments

Comments
 (0)