From d6a0d49018e630a1356724043536a5c14fa368bf Mon Sep 17 00:00:00 2001 From: Achilleas Koutsou Date: Tue, 7 May 2024 20:04:03 +0200 Subject: [PATCH] blueprint: add new kickstart.contents option --- internal/blueprint/blueprint.go | 10 +++++++++- internal/blueprint/installer_customizatios.go | 9 +++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/internal/blueprint/blueprint.go b/internal/blueprint/blueprint.go index 6726dd1e45e..4434b37adea 100644 --- a/internal/blueprint/blueprint.go +++ b/internal/blueprint/blueprint.go @@ -352,7 +352,15 @@ func Convert(bp Blueprint) iblueprint.Blueprint { customizations.FIPS = fips } if installer := c.Installer; installer != nil { - iinst := iblueprint.InstallerCustomization(*installer) + iinst := iblueprint.InstallerCustomization{ + Unattended: installer.Unattended, + SudoNopasswd: installer.SudoNopasswd, + } + if installer.Kickstart != nil { + iinst.Kickstart = &iblueprint.Kickstart{ + Contents: installer.Kickstart.Contents, + } + } customizations.Installer = &iinst } } diff --git a/internal/blueprint/installer_customizatios.go b/internal/blueprint/installer_customizatios.go index 9932b759013..471112a9e39 100644 --- a/internal/blueprint/installer_customizatios.go +++ b/internal/blueprint/installer_customizatios.go @@ -1,6 +1,11 @@ package blueprint type InstallerCustomization struct { - Unattended bool `json:"unattended,omitempty" toml:"unattended,omitempty"` - SudoNopasswd []string `json:"sudo-nopasswd,omitempty" toml:"sudo-nopasswd,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"` +} + +type Kickstart struct { + Contents string `json:"contents" toml:"contents"` }