go.mod: update osbuild/images to v0.155.0
tag v0.152.0 Tagger: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> Changes with 0.152.0 ---------------- * Update snapshots to 20250605 (osbuild/images#1586) * Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger * distro: followups for reivew feedback in PR#1563 (osbuild/images#1584) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger, Tomáš Hozza * fedora/wsl: xz compression (HMS-8573) (osbuild/images#1582) * Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Florian Schüller — Somewhere on the Internet, 2025-06-16 --- tag v0.153.0 Tagger: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> Changes with 0.153.0 ---------------- * GHA: enable the stale action to delete its saved state (osbuild/images#1602) * Author: Tomáš Hozza, Reviewers: Lukáš Zapletal, Simon de Vlieger * Smaller isos (osbuild/images#1599) * Author: Brian C. Lane, Reviewers: Lukáš Zapletal, Simon de Vlieger * Update snapshots to 20250618 (osbuild/images#1603) * Author: SchutzBot, Reviewers: Brian C. Lane, Simon de Vlieger * distro/rhel-10: WSL distribution config (HMS-8573) (osbuild/images#1591) * Author: Simon de Vlieger, Reviewers: Gianluca Zuccarelli, Lukáš Zapletal, Tomáš Hozza * distro/rhel-10: new `vagrant-libvirt` image type (HMS-6116) (osbuild/images#1601) * Author: Simon de Vlieger, Reviewers: Michael Vogt, Tomáš Hozza * distro/rhel{8,9,10}: WSL extension and compression (HMS-8573) (osbuild/images#1590) * Author: Simon de Vlieger, Reviewers: Michael Vogt, Tomáš Hozza * distro: handle `centos-9` and similar versions better (osbuild/images#1598) * Author: Michael Vogt, Reviewers: Simon de Vlieger, Tomáš Hozza * osbuild/grub2: add compat_version and set it to 2 (osbuild/images#1595) * Author: Achilleas Koutsou, Reviewers: Brian C. Lane, Tomáš Hozza — Somewhere on the Internet, 2025-06-20 ---
This commit is contained in:
parent
4324f24fe7
commit
395f68549d
45 changed files with 1867 additions and 1823 deletions
76
vendor/github.com/osbuild/images/pkg/manifest/os.go
generated
vendored
76
vendor/github.com/osbuild/images/pkg/manifest/os.go
generated
vendored
|
|
@ -99,37 +99,38 @@ type OSCustomizations struct {
|
|||
ShellInit []shell.InitFile
|
||||
|
||||
// TODO: drop osbuild types from the API
|
||||
Firewall *osbuild.FirewallStageOptions
|
||||
Grub2Config *osbuild.GRUB2Config
|
||||
Sysconfig []*osbuild.SysconfigStageOptions
|
||||
SystemdLogind []*osbuild.SystemdLogindStageOptions
|
||||
CloudInit []*osbuild.CloudInitStageOptions
|
||||
Modprobe []*osbuild.ModprobeStageOptions
|
||||
DracutConf []*osbuild.DracutConfStageOptions
|
||||
SystemdDropin []*osbuild.SystemdUnitStageOptions
|
||||
SystemdUnit []*osbuild.SystemdUnitCreateStageOptions
|
||||
Authselect *osbuild.AuthselectStageOptions
|
||||
SELinuxConfig *osbuild.SELinuxConfigStageOptions
|
||||
Tuned *osbuild.TunedStageOptions
|
||||
Tmpfilesd []*osbuild.TmpfilesdStageOptions
|
||||
PamLimitsConf []*osbuild.PamLimitsConfStageOptions
|
||||
Sysctld []*osbuild.SysctldStageOptions
|
||||
DNFConfig []*osbuild.DNFConfigStageOptions
|
||||
DNFAutomaticConfig *osbuild.DNFAutomaticConfigStageOptions
|
||||
YUMConfig *osbuild.YumConfigStageOptions
|
||||
YUMRepos []*osbuild.YumReposStageOptions
|
||||
SshdConfig *osbuild.SshdConfigStageOptions
|
||||
GCPGuestAgentConfig *osbuild.GcpGuestAgentConfigOptions
|
||||
AuthConfig *osbuild.AuthconfigStageOptions
|
||||
PwQuality *osbuild.PwqualityConfStageOptions
|
||||
ChronyConfig *osbuild.ChronyStageOptions
|
||||
WAAgentConfig *osbuild.WAAgentConfStageOptions
|
||||
UdevRules *osbuild.UdevRulesStageOptions
|
||||
WSLConfig *osbuild.WSLConfStageOptions
|
||||
InsightsClientConfig *osbuild.InsightsClientConfigStageOptions
|
||||
NetworkManager *osbuild.NMConfStageOptions
|
||||
Presets []osbuild.Preset
|
||||
ContainersStorage *string
|
||||
Firewall *osbuild.FirewallStageOptions
|
||||
Grub2Config *osbuild.GRUB2Config
|
||||
Sysconfig []*osbuild.SysconfigStageOptions
|
||||
SystemdLogind []*osbuild.SystemdLogindStageOptions
|
||||
CloudInit []*osbuild.CloudInitStageOptions
|
||||
Modprobe []*osbuild.ModprobeStageOptions
|
||||
DracutConf []*osbuild.DracutConfStageOptions
|
||||
SystemdDropin []*osbuild.SystemdUnitStageOptions
|
||||
SystemdUnit []*osbuild.SystemdUnitCreateStageOptions
|
||||
Authselect *osbuild.AuthselectStageOptions
|
||||
SELinuxConfig *osbuild.SELinuxConfigStageOptions
|
||||
Tuned *osbuild.TunedStageOptions
|
||||
Tmpfilesd []*osbuild.TmpfilesdStageOptions
|
||||
PamLimitsConf []*osbuild.PamLimitsConfStageOptions
|
||||
Sysctld []*osbuild.SysctldStageOptions
|
||||
DNFConfig []*osbuild.DNFConfigStageOptions
|
||||
DNFAutomaticConfig *osbuild.DNFAutomaticConfigStageOptions
|
||||
YUMConfig *osbuild.YumConfigStageOptions
|
||||
YUMRepos []*osbuild.YumReposStageOptions
|
||||
SshdConfig *osbuild.SshdConfigStageOptions
|
||||
GCPGuestAgentConfig *osbuild.GcpGuestAgentConfigOptions
|
||||
AuthConfig *osbuild.AuthconfigStageOptions
|
||||
PwQuality *osbuild.PwqualityConfStageOptions
|
||||
ChronyConfig *osbuild.ChronyStageOptions
|
||||
WAAgentConfig *osbuild.WAAgentConfStageOptions
|
||||
UdevRules *osbuild.UdevRulesStageOptions
|
||||
WSLConfig *osbuild.WSLConfStageOptions
|
||||
WSLDistributionConfig *osbuild.WSLDistributionConfStageOptions
|
||||
InsightsClientConfig *osbuild.InsightsClientConfigStageOptions
|
||||
NetworkManager *osbuild.NMConfStageOptions
|
||||
Presets []osbuild.Preset
|
||||
ContainersStorage *string
|
||||
|
||||
// OpenSCAP config
|
||||
OpenSCAPRemediationConfig *oscap.RemediationConfig
|
||||
|
|
@ -381,7 +382,7 @@ func (p *OS) getBuildPackages(distro Distro) []string {
|
|||
packages = append(packages, "python3-pyyaml")
|
||||
}
|
||||
}
|
||||
if len(p.OSCustomizations.DNFConfig) > 0 || p.OSCustomizations.RHSMConfig != nil || p.OSCustomizations.WSLConfig != nil {
|
||||
if len(p.OSCustomizations.DNFConfig) > 0 || p.OSCustomizations.RHSMConfig != nil || p.OSCustomizations.WSLConfig != nil || p.OSCustomizations.WSLDistributionConfig != nil {
|
||||
packages = append(packages, "python3-iniparse")
|
||||
}
|
||||
|
||||
|
|
@ -852,6 +853,17 @@ func (p *OS) serialize() osbuild.Pipeline {
|
|||
pipeline.AddStage(osbuild.NewWSLConfStage(p.OSCustomizations.WSLConfig))
|
||||
}
|
||||
|
||||
if p.OSCustomizations.WSLDistributionConfig != nil {
|
||||
// We format in our version string into the name field, if there's no %s in there nothing
|
||||
// special will happen.
|
||||
p.OSCustomizations.WSLDistributionConfig.OOBE.DefaultName = fmt.Sprintf(
|
||||
p.OSCustomizations.WSLDistributionConfig.OOBE.DefaultName,
|
||||
p.OSVersion,
|
||||
)
|
||||
|
||||
pipeline.AddStage(osbuild.NewWSLDistributionConfStage(p.OSCustomizations.WSLDistributionConfig))
|
||||
}
|
||||
|
||||
if p.OSCustomizations.FIPS {
|
||||
pipeline.AddStages(osbuild.GenFIPSStages()...)
|
||||
p.addInlineDataAndStages(&pipeline, osbuild.GenFIPSFiles())
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue