particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

blueprint: delete HasIgnition() function

Browse source 
Unify how are allowed options checked in distro implementation in
relation to Ignition customization. Specifically, delete `HasIgnition()`
function and replace its use by `GetIgnition()` call and checking if it is
`nil`. This approach is consistent with how this is checked for other
customizations.

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
Tomáš Hozza 2023-01-31 12:27:40 +01:00 • committed by Sanne Raymaekers
parent 317565f2c4
commit 0e4dabd265
2 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/blueprint/customizations.go
View file

@ -407,7 +407,3 @@ func (c *Customizations) GetIgnition() *IgnitionCustomization {
} }
return c.Ignition return c.Ignition
} }
func (c *IgnitionCustomization) HasIgnition() bool {
return c != nil
}

2
internal/distro/rhel9/imagetype.go
View file

@ -360,7 +360,7 @@ func (t *imageType) checkOptions(customizations *blueprint.Customizations, optio
} }
// ignition is optional, we might be using FDO // ignition is optional, we might be using FDO
if customizations.Ignition.HasIgnition() { if customizations.GetIgnition() != nil {
if customizations.GetIgnition().Embedded != nil && customizations.GetIgnition().FirstBoot != nil { if customizations.GetIgnition().Embedded != nil && customizations.GetIgnition().FirstBoot != nil {
return fmt.Errorf("both ignition embedded and firstboot configurations found") return fmt.Errorf("both ignition embedded and firstboot configurations found")
} }