blueprint: add new kickstart.contents option

osbuild · May 23, 2024 · 66df216 · 66df216
1 parent 33fab6f
commit 66df216
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git 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
@@ -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"`
 }