Skip to content

Commit

Permalink
fedora: machine-id for iot
Browse files Browse the repository at this point in the history
Don't turn off the regeneration of the machine id for the iot image
types, it breaks in rpm-ostree.

Signed-off-by: Simon de Vlieger <[email protected]>
  • Loading branch information
supakeen committed Feb 28, 2025
1 parent 305179f commit 5d6086c
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions pkg/distro/fedora/distro.go
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,9 @@ func mkIotCommitImgType(d distribution) imageType {
osPkgsKey: packageSetLoader,
},
defaultImageConfig: &distro.ImageConfig{
EnabledServices: iotServices,
DracutConf: []*osbuild.DracutConfStageOptions{osbuild.FIPSDracutConfStageOptions},
EnabledServices: iotServices,
DracutConf: []*osbuild.DracutConfStageOptions{osbuild.FIPSDracutConfStageOptions},
MachineIdUninitialized: common.ToPtr(false),
},
rpmOstree: true,
image: iotCommitImage,
Expand All @@ -173,6 +174,9 @@ func mkIotBootableContainer(d distribution) imageType {
packageSets: map[string]packageSetFunc{
osPkgsKey: packageSetLoader,
},
defaultImageConfig: &distro.ImageConfig{
MachineIdUninitialized: common.ToPtr(false),
},
rpmOstree: true,
image: bootableContainerImage,
buildPipelines: []string{"build"},
Expand All @@ -195,8 +199,9 @@ func mkIotOCIImgType(d distribution) imageType {
},
},
defaultImageConfig: &distro.ImageConfig{
EnabledServices: iotServices,
DracutConf: []*osbuild.DracutConfStageOptions{osbuild.FIPSDracutConfStageOptions},
EnabledServices: iotServices,
DracutConf: []*osbuild.DracutConfStageOptions{osbuild.FIPSDracutConfStageOptions},
MachineIdUninitialized: common.ToPtr(false),
},
rpmOstree: true,
bootISO: false,
Expand Down

0 comments on commit 5d6086c

Please sign in to comment.