fix: disable grub boot success for edge images

grub_boot_success is stepping over greenboot as it its marking boot as successful in case of any ssh connection that persists over two min. Fix is done for rhel-edge-9 and fedora-iot. Signed-off-by: Sayan Paul <saypaul@redhat.com>
osbuild · Jul 25, 2023 · 89ea2f9 · 89ea2f9
1 parent ef70128
commit 89ea2f9
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 9 deletions.
diff --git a/pkg/distro/fedora/distro.go b/pkg/distro/fedora/distro.go
@@ -62,6 +62,11 @@ var (
 		"dbus-parsec",
 	}
 
+	disabledIotServices = []string{
+		//grub-boot-success interfering with greenboot
+		"grub-boot-success.service", "grub-boot-success.timer",
+	}
+
 	// Image Definitions
 	imageInstallerImgType = imageType{
 		name:        "image-installer",
@@ -107,7 +112,8 @@ var (
 			osPkgsKey: iotCommitPackageSet,
 		},
 		defaultImageConfig: &distro.ImageConfig{
-			EnabledServices: iotServices,
+			EnabledServices:  iotServices,
+			DisabledServices: disabledIotServices,
 		},
 		rpmOstree:        true,
 		image:            iotCommitImage,
@@ -128,7 +134,8 @@ var (
 			},
 		},
 		defaultImageConfig: &distro.ImageConfig{
-			EnabledServices: iotServices,
+			EnabledServices:  iotServices,
+			DisabledServices: disabledIotServices,
 		},
 		rpmOstree:        true,
 		bootISO:          false,
@@ -147,8 +154,9 @@ var (
 			installerPkgsKey: iotInstallerPackageSet,
 		},
 		defaultImageConfig: &distro.ImageConfig{
-			Locale:          common.ToPtr("en_US.UTF-8"),
-			EnabledServices: iotServices,
+			Locale:           common.ToPtr("en_US.UTF-8"),
+			EnabledServices:  iotServices,
+			DisabledServices: disabledIotServices,
 		},
 		rpmOstree:        true,
 		bootISO:          true,

diff --git a/pkg/distro/rhel9/edge.go b/pkg/distro/rhel9/edge.go
@@ -22,7 +22,8 @@ var (
 			osPkgsKey: edgeCommitPackageSet,
 		},
 		defaultImageConfig: &distro.ImageConfig{
-			EnabledServices: edgeServices,
+			EnabledServices:  edgeServices,
+			DisabledServices: disabledServices,
 		},
 		rpmOstree:        true,
 		image:            edgeCommitImage,
@@ -45,7 +46,8 @@ var (
 			},
 		},
 		defaultImageConfig: &distro.ImageConfig{
-			EnabledServices: edgeServices,
+			EnabledServices:  edgeServices,
+			DisabledServices: disabledServices,
 		},
 		rpmOstree:        true,
 		bootISO:          false,
@@ -92,8 +94,9 @@ var (
 			installerPkgsKey: edgeInstallerPackageSet,
 		},
 		defaultImageConfig: &distro.ImageConfig{
-			Locale:          common.ToPtr("en_US.UTF-8"),
-			EnabledServices: edgeServices,
+			Locale:           common.ToPtr("en_US.UTF-8"),
+			EnabledServices:  edgeServices,
+			DisabledServices: disabledServices,
 		},
 		rpmOstree:        true,
 		bootISO:          true,
@@ -119,7 +122,8 @@ var (
 			installerPkgsKey: edgeSimplifiedInstallerPackageSet,
 		},
 		defaultImageConfig: &distro.ImageConfig{
-			EnabledServices: edgeServices,
+			EnabledServices:  edgeServices,
+			DisabledServices: disabledServices,
 		},
 		defaultSize:         10 * common.GibiByte,
 		rpmOstree:           true,
@@ -197,6 +201,11 @@ var (
 		"NetworkManager.service", "firewalld.service", "sshd.service", "fdo-client-linuxapp.service",
 	}
 
+	disabledServices = []string{
+		//grub-boot-success interfering with greenboot
+		"grub-boot-success.service", "grub-boot-success.timer",
+	}
+
 	// Partition tables
 	edgeBasePartitionTables = distro.BasePartitionTableMap{
 		platform.ARCH_X86_64.String(): disk.PartitionTable{