Repository: osbuild/osbuild-composer
Pull request #2791 (2022-06-30 13:20:27)

distro: don't enable fdo-client service on RHEL 8.5
RHEL 8.5 doesn't have FDO and it's not installed, but we were enabling the service for it in edge.


achilleas-k: Accidentally disabled on CS8 as well.  Updated.

Patch:
diff --git a/internal/distro/rhel86/distro.go b/internal/distro/rhel86/distro.go
index c86878cb1..615cd9313 100644
--- a/internal/distro/rhel86/distro.go
+++ b/internal/distro/rhel86/distro.go
@@ -691,8 +691,14 @@ func newDistro(distroName string) distro.Distro {
 
 	// Shared Services
 	edgeServices := []string{
+		"NetworkManager.service", "firewalld.service", "sshd.service",
+	}
+
+	if !(rd.isRHEL() && versionLessThan(rd.osVersion, "8.6")) {
+		// enable fdo-client only on RHEL 8.6+ and CS8
+
 		// TODO(runcom): move fdo-client-linuxapp.service to presets?
-		"NetworkManager.service", "firewalld.service", "sshd.service", "fdo-client-linuxapp.service",
+		edgeServices = append(edgeServices, "fdo-client-linuxapp.service")
 	}
 
 	// Image Definitions


Test patch:
diff --git a/test/data/manifests/rhel_85-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_85-aarch64-edge_commit-boot.json
index aafb8e233..f42f7506b 100644
--- a/test/data/manifests/rhel_85-aarch64-edge_commit-boot.json
+++ b/test/data/manifests/rhel_85-aarch64-edge_commit-boot.json
@@ -1945,8 +1945,7 @@
               "enabled_services": [
                 "NetworkManager.service",
                 "firewalld.service",
-                "sshd.service",
-                "fdo-client-linuxapp.service"
+                "sshd.service"
               ]
             }
           },
diff --git a/test/data/manifests/rhel_85-aarch64-edge_container-boot.json b/test/data/manifests/rhel_85-aarch64-edge_container-boot.json
index 1bbf02148..18f34d73f 100644
--- a/test/data/manifests/rhel_85-aarch64-edge_container-boot.json
+++ b/test/data/manifests/rhel_85-aarch64-edge_container-boot.json
@@ -1945,8 +1945,7 @@
               "enabled_services": [
                 "NetworkManager.service",
                 "firewalld.service",
-                "sshd.service",
-                "fdo-client-linuxapp.service"
+                "sshd.service"
               ]
             }
           },
diff --git a/test/data/manifests/rhel_85-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_85-x86_64-edge_commit-boot.json
index 87cc8a33e..7e29f4468 100644
--- a/test/data/manifests/rhel_85-x86_64-edge_commit-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-edge_commit-boot.json
@@ -2024,8 +2024,7 @@
               "enabled_services": [
                 "NetworkManager.service",
                 "firewalld.service",
-                "sshd.service",
-                "fdo-client-linuxapp.service"
+                "sshd.service"
               ]
             }
           },
diff --git a/test/data/manifests/rhel_85-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_85-x86_64-edge_commit_rt-boot.json
index c62c831bc..9ef8d7a91 100644
--- a/test/data/manifests/rhel_85-x86_64-edge_commit_rt-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-edge_commit_rt-boot.json
@@ -2096,8 +2096,7 @@
               "enabled_services": [
                 "NetworkManager.service",
                 "firewalld.service",
-                "sshd.service",
-                "fdo-client-linuxapp.service"
+                "sshd.service"
               ]
             }
           },
diff --git a/test/data/manifests/rhel_85-x86_64-edge_container-boot.json b/test/data/manifests/rhel_85-x86_64-edge_container-boot.json
index 3a3da55a4..8f14d9519 100644
--- a/test/data/manifests/rhel_85-x86_64-edge_container-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-edge_container-boot.json
@@ -2014,8 +2014,7 @@
               "enabled_services": [
                 "NetworkManager.service",
                 "firewalld.service",
-                "sshd.service",
-                "fdo-client-linuxapp.service"
+                "sshd.service"
               ]
             }
           },