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

blueprint: enable the anaconda modules customization

Browse source 
This has been available since v0.74.0 of osbuild/images but was never
connected to the frontend blueprint.

See https://github.com/osbuild/images/pull/799
This commit is contained in:
Achilleas Koutsou 2024-10-21 18:32:39 +02:00 • committed by Simon de Vlieger
parent fb7a2aab96
commit 654a6ad8f5
3 changed files with 33 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/blueprint/blueprint.go
View file

@ -355,6 +355,12 @@ func Convert(bp Blueprint) iblueprint.Blueprint {
Contents: installer.Kickstart.Contents,
}
}
if installer.Modules != nil {
iinst.Modules = &iblueprint.AnacondaModules{
Enable: installer.Modules.Enable,
Disable: installer.Modules.Disable,
}
}
customizations.Installer = &iinst
}
if rpm := c.RPM; rpm != nil && rpm.ImportKeys != nil {

18
internal/blueprint/blueprint_convert_test.go
View file

@ -173,6 +173,15 @@ func TestConvert(t *testing.T) {
Installer: &InstallerCustomization{
Unattended: true,
SudoNopasswd: []string{"%group", "user"},
Modules: &AnacondaModules{
Enable: []string{
"org.fedoraproject.Anaconda.Modules.Localization",
"org.fedoraproject.Anaconda.Modules.Users",
},
Disable: []string{
"org.fedoraproject.Anaconda.Modules.Network",
},
},
},
RPM: &RPMCustomization{
ImportKeys: &RPMImportKeys{
@ -351,6 +360,15 @@ func TestConvert(t *testing.T) {
Installer: &iblueprint.InstallerCustomization{
Unattended: true,
SudoNopasswd: []string{"%group", "user"},
Modules: &iblueprint.AnacondaModules{
Enable: []string{
"org.fedoraproject.Anaconda.Modules.Localization",
"org.fedoraproject.Anaconda.Modules.Users",
},
Disable: []string{
"org.fedoraproject.Anaconda.Modules.Network",
},
},
},
RPM: &iblueprint.RPMCustomization{
ImportKeys: &iblueprint.RPMImportKeys{

12
internal/blueprint/installer_customizatios.go
View file

@ -1,11 +1,17 @@
package blueprint
type InstallerCustomization struct {
Unattended bool `json:"unattended,omitempty" toml:"unattended,omitempty"`
SudoNopasswd []string `json:"sudo-nopasswd,omitempty" toml:"sudo-nopasswd,omitempty"`
Kickstart *Kickstart `json:"kickstart,omitempty" toml:"kickstart,omitempty"`
Unattended bool `json:"unattended,omitempty" toml:"unattended,omitempty"`
SudoNopasswd []string `json:"sudo-nopasswd,omitempty" toml:"sudo-nopasswd,omitempty"`
Kickstart *Kickstart `json:"kickstart,omitempty" toml:"kickstart,omitempty"`
Modules *AnacondaModules `json:"modules,omitempty" toml:"modules,omitempty"`
}
type Kickstart struct {
Contents string `json:"contents" toml:"contents"`
}
type AnacondaModules struct {
Enable []string `json:"enable,omitempty" toml:"enable,omitempty"`
Disable []string `json:"disable,omitempty" toml:"disable,omitempty"`
}