Skip to content

Commit

Permalink
support kargs in edge blueprint
Browse files Browse the repository at this point in the history
Signed-off-by: Antonio Murdaca <[email protected]>
  • Loading branch information
runcom committed Jan 11, 2023
1 parent 382db42 commit f26e684
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions internal/distro/rhel9/imagetype.go
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ func (t *imageType) checkOptions(customizations *blueprint.Customizations, optio
}

if t.name == "edge-simplified-installer" {
allowed := []string{"InstallationDevice", "FDO", "Ignition"}
allowed := []string{"InstallationDevice", "FDO", "Ignition", "Kernel"}
if err := customizations.CheckAllowed(allowed...); err != nil {
return fmt.Errorf("unsupported blueprint customizations found for boot ISO image type %q: (allowed: %s)", t.name, strings.Join(allowed, ", "))
}
Expand Down Expand Up @@ -388,7 +388,7 @@ func (t *imageType) checkOptions(customizations *blueprint.Customizations, optio
return fmt.Errorf("edge raw images require specifying a URL from which to retrieve the OSTree commit")
}

if kernelOpts := customizations.GetKernel(); kernelOpts.Append != "" && t.rpmOstree {
if kernelOpts := customizations.GetKernel(); kernelOpts.Append != "" && t.rpmOstree && t.name != "edge-raw-image" && t.name != "edge-simplified-installer" {
return fmt.Errorf("kernel boot parameter customizations are not supported for ostree types")
}

Expand Down

0 comments on commit f26e684

Please sign in to comment.