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

internal: mandate installation device for the simplified installer

Browse source 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
This commit is contained in:
Antonio Murdaca 2021-09-08 17:17:10 +02:00 • committed by Achilleas Koutsou
parent 26b96483a3
commit 5005ff6184
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
internal/blueprint/customizations.go
View file

@ -332,9 +332,8 @@ func (c *Customizations) GetFilesystemsMinSize() uint64 {
}
func (c *Customizations) GetInstallationDevice() string {
defaultDevice := "/dev/sda"
if c == nil || c.InstallationDevice == "" {
return defaultDevice
return ""
}
return c.InstallationDevice
}

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

@ -461,6 +461,9 @@ func (t *imageType) checkOptions(customizations *blueprint.Customizations, optio
if err := customizations.CheckAllowed("InstallationDevice"); err != nil {
return fmt.Errorf("boot ISO image type %q contains unsupported blueprint customizations: %v", t.name, err)
}
if customizations.GetInstallationDevice() == "" {
return fmt.Errorf("boot ISO image type %q requires specifying an installation device to install to", t.name)
}
} else if customizations != nil {
return fmt.Errorf("boot ISO image type %q does not support blueprint customizations", t.name)
}

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

@ -461,6 +461,9 @@ func (t *imageType) checkOptions(customizations *blueprint.Customizations, optio
if err := customizations.CheckAllowed("InstallationDevice"); err != nil {
return fmt.Errorf("boot ISO image type %q contains unsupported blueprint customizations: %v", t.name, err)
}
if customizations.GetInstallationDevice() == "" {
return fmt.Errorf("boot ISO image type %q requires specifying an installation device to install to", t.name)
}
} else if customizations != nil {
return fmt.Errorf("boot ISO image type %q does not support blueprint customizations", t.name)
}