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

distro/rhel86+90: common error message for unsupported customizations

Browse source 
Use the same error message for both edge-installer and
edge-simplified-installer when an unsupported customization is added.
This commit is contained in:
Achilleas Koutsou 2022-02-28 19:17:20 +01:00 • committed by Ondřej Budai
parent 3a1765a5a8
commit db2910fed9
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
internal/distro/rhel86/distro.go
View file

@ -562,8 +562,9 @@ func (t *imageType) checkOptions(customizations *blueprint.Customizations, optio
}
if t.name == "edge-simplified-installer" {
if err := customizations.CheckAllowed("InstallationDevice", "FDO"); err != nil {
return fmt.Errorf("boot ISO image type %q contains unsupported blueprint customizations: %v", t.name, err)
allowed := []string{"InstallationDevice", "FDO"}
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, ", "))
}
if customizations.GetInstallationDevice() == "" {
return fmt.Errorf("boot ISO image type %q requires specifying an installation device to install to", t.name)

5
internal/distro/rhel90/distro.go
View file

@ -550,8 +550,9 @@ func (t *imageType) checkOptions(customizations *blueprint.Customizations, optio
}
if t.name == "edge-simplified-installer" {
if err := customizations.CheckAllowed("InstallationDevice", "FDO"); err != nil {
return fmt.Errorf("boot ISO image type %q contains unsupported blueprint customizations: %v", t.name, err)
allowed := []string{"InstallationDevice", "FDO"}
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, ", "))
}
if customizations.GetInstallationDevice() == "" {
return fmt.Errorf("boot ISO image type %q requires specifying an installation device to install to", t.name)