fix(fedora-iot-raw): enable ignition-firstboot-complete.service

enabling this service by default so that /boot/ignition.firstboot file is removed on first boot successfully. Signed-off-by: Sarita Mahajan <[email protected]>
osbuild · Feb 19, 2025 · 85e38ae · 85e38ae
1 parent 201158b
commit 85e38ae
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/pkg/distro/fedora/distro.go b/pkg/distro/fedora/distro.go
@@ -265,6 +265,7 @@ var (
 			OSTreeConfSysrootReadOnly: common.ToPtr(true),
 			LockRootUser:              common.ToPtr(true),
 			IgnitionPlatform:          common.ToPtr("metal"),
+			EnabledServices:           []string{"ignition-firstboot-complete.service"},
 		},
 		defaultSize:         4 * datasizes.GibiByte,
 		rpmOstree:           true,

diff --git a/pkg/distro/fedora/images.go b/pkg/distro/fedora/images.go
@@ -307,6 +307,9 @@ func ostreeDeploymentCustomizations(
 		deploymentConf.CustomFileSystems = append(deploymentConf.CustomFileSystems, fs.Mountpoint)
 	}
 
+	deploymentConf.EnabledServices = imageConfig.EnabledServices
+	deploymentConf.DisabledServices = imageConfig.DisabledServices
+
 	return deploymentConf, nil
 }
 

diff --git a/pkg/image/ostree_disk.go b/pkg/image/ostree_disk.go
@@ -81,8 +81,8 @@ func baseRawOstreeImage(img *OSTreeDiskImage, buildPipeline manifest.Build, opts
 
 	// other image types (e.g. live) pass the workload to the pipeline.
 	if img.Workload != nil {
-		osPipeline.EnabledServices = img.Workload.GetServices()
-		osPipeline.DisabledServices = img.Workload.GetDisabledServices()
+		osPipeline.OSTreeDeploymentCustomizations.EnabledServices = append(osPipeline.OSTreeDeploymentCustomizations.EnabledServices, img.Workload.GetServices()...)
+		osPipeline.OSTreeDeploymentCustomizations.DisabledServices = append(osPipeline.OSTreeDeploymentCustomizations.DisabledServices, img.Workload.GetDisabledServices()...)
 	}
 	return manifest.NewRawOStreeImage(buildPipeline, osPipeline, img.Platform)
 }

diff --git a/pkg/manifest/ostree_deployment.go b/pkg/manifest/ostree_deployment.go
@@ -42,6 +42,9 @@ type OSTreeDeploymentCustomizations struct {
 	// Lock the root account in the deployment unless the user defined root
 	// user options in the build configuration.
 	LockRoot bool
+
+	EnabledServices  []string
+	DisabledServices []string
 }
 
 // OSTreeDeployment represents the filesystem tree of a target image based
@@ -78,9 +81,6 @@ type OSTreeDeployment struct {
 
 	PartitionTable *disk.PartitionTable
 
-	EnabledServices  []string
-	DisabledServices []string
-
 	// Use bootupd instead of grub2 as the bootloader
 	UseBootupd bool
 }
@@ -375,7 +375,7 @@ func (p *OSTreeDeployment) serialize() osbuild.Pipeline {
 			stageOption := osbuild.NewSystemdUnitCreateStage(createMountpointService(serviceName, p.CustomFileSystems))
 			stageOption.MountOSTree(p.osName, ref, 0)
 			pipeline.AddStage(stageOption)
-			p.EnabledServices = append(p.EnabledServices, serviceName)
+			p.OSTreeDeploymentCustomizations.EnabledServices = append(p.OSTreeDeploymentCustomizations.EnabledServices, serviceName)
 		}
 
 		// We enable / disable services below using the systemd stage, but its effect
@@ -384,8 +384,8 @@ func (p *OSTreeDeployment) serialize() osbuild.Pipeline {
 		// only when Ignition is used. To prevent this and to not have a special cases
 		// in the code based on distro version, we enable / disable services also by
 		// creating a preset file.
-		if len(p.EnabledServices) != 0 || len(p.DisabledServices) != 0 {
-			presetsStage := osbuild.GenServicesPresetStage(p.EnabledServices, p.DisabledServices)
+		if len(p.OSTreeDeploymentCustomizations.EnabledServices) != 0 || len(p.OSTreeDeploymentCustomizations.DisabledServices) != 0 {
+			presetsStage := osbuild.GenServicesPresetStage(p.OSTreeDeploymentCustomizations.EnabledServices, p.OSTreeDeploymentCustomizations.DisabledServices)
 			presetsStage.MountOSTree(p.osName, ref, 0)
 			pipeline.AddStage(presetsStage)
 		}
@@ -475,10 +475,10 @@ func (p *OSTreeDeployment) serialize() osbuild.Pipeline {
 		pipeline.AddStages(fileStages...)
 	}
 
-	if len(p.EnabledServices) != 0 || len(p.DisabledServices) != 0 {
+	if len(p.OSTreeDeploymentCustomizations.EnabledServices) != 0 || len(p.OSTreeDeploymentCustomizations.DisabledServices) != 0 {
 		systemdStage := osbuild.NewSystemdStage(&osbuild.SystemdStageOptions{
-			EnabledServices:  p.EnabledServices,
-			DisabledServices: p.DisabledServices,
+			EnabledServices:  p.OSTreeDeploymentCustomizations.EnabledServices,
+			DisabledServices: p.OSTreeDeploymentCustomizations.DisabledServices,
 		})
 		systemdStage.MountOSTree(p.osName, ref, 0)
 		pipeline.AddStage(systemdStage)