Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add missing Install attributes #111

Merged
merged 6 commits into from
May 6, 2024
Merged

Add missing Install attributes #111

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5d3d584
Add missing Install attributes
mauromorales May 6, 2024
fa71261
Remove unused
mauromorales May 6, 2024
79c260a
Add missing structs
mauromorales May 6, 2024
775f822
Make Image.Source a string
mauromorales May 6, 2024
b312ea7
Remove firmware and part-table
mauromorales May 6, 2024
505af6d
Remove unused attributes
mauromorales May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion schema/install_schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,33 @@ type InstallSchema struct {
GrubOptionsSchema `json:"grub_options,omitempty"`
Image string `json:"image,omitempty" description:"Use a different container image for the installation"`
PowerManagement
SkipEncryptCopyPlugins bool `json:"skip_copy_kcrypt_plugin,omitempty"`
SkipEncryptCopyPlugins bool `json:"skip_copy_kcrypt_plugin,omitempty"`
Partitions ElementalPartitions `json:"partitions,omitempty" mapstructure:"partitions"`
Itxaka marked this conversation as resolved.
Show resolved Hide resolved
GrubDefEntry string `json:"grub-entry-name,omitempty" mapstructure:"grub-entry-name"`
ExtraPartitions []*Partition `json:"extra-partitions,omitempty" mapstructure:"extra-partitions"`
Force bool `json:"force,omitempty" mapstructure:"force"`
ExtraDirsRootfs []string `json:"extra-dirs-rootfs,omitempty" mapstructure:"extra-dirs-rootfs"`
Active Image `json:"system,omitempty" mapstructure:"system"`
Recovery Image `json:"recovery-system,omitempty" mapstructure:"recovery-system"`
Passive Image `json:"passive,omitempty" mapstructure:"recovery-system"`
}

type Image struct {
Size uint `json:"size,omitempty" mapstructure:"size"`
Source string `json:"uri,omitempty" mapstructure:"uri"`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have no idea to be honest. The processing of this is done on the spec generation I think so a string should be ok I guess?

}

type Partition struct {
Itxaka marked this conversation as resolved.
Show resolved Hide resolved
Name string `json:"name,omitempty"`
Itxaka marked this conversation as resolved.
Show resolved Hide resolved
Size uint `json:"size,omitempty" mapstructure:"size"`
FS string `json:"fs,omitempty" mapstrcuture:"fs"`
}

type ElementalPartitions struct {
OEM *Partition `json:"oem,omitempty" mapstructure:"oem"`
Recovery *Partition `json:"recovery,omitempty" mapstructure:"recovery"`
State *Partition `json:"state,omitempty" mapstructure:"state"`
Persistent *Partition `json:"persistent,omitempty" mapstructure:"persistent"`
}

// BundleSchema represents the bundle block which can be used in different places of the Kairos configuration. It is used to reference a bundle and its confguration.
Expand Down