particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

distro: don't enable fdo-client service on RHEL 8.5

Browse source 
RHEL 8.5 doesn't have FDO and it's not installed, but we were enabling
the service for it in edge.
This commit is contained in:
Achilleas Koutsou 2022-06-30 15:18:41 +02:00 • committed by Christian Kellner
parent 54ae069b94
commit 444b8e33c9
6 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
internal/distro/rhel86/distro.go
View file

@ -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

3
test/data/manifests/rhel_85-aarch64-edge_commit-boot.json
View file

@ -1945,8 +1945,7 @@
"enabled_services": [
"NetworkManager.service",
"firewalld.service",
"sshd.service",
"fdo-client-linuxapp.service"
"sshd.service"
]
}
},

3
test/data/manifests/rhel_85-aarch64-edge_container-boot.json
View file

@ -1945,8 +1945,7 @@
"enabled_services": [
"NetworkManager.service",
"firewalld.service",
"sshd.service",
"fdo-client-linuxapp.service"
"sshd.service"
]
}
},

3
test/data/manifests/rhel_85-x86_64-edge_commit-boot.json
View file

@ -2024,8 +2024,7 @@
"enabled_services": [
"NetworkManager.service",
"firewalld.service",
"sshd.service",
"fdo-client-linuxapp.service"
"sshd.service"
]
}
},

3
test/data/manifests/rhel_85-x86_64-edge_commit_rt-boot.json
View file

@ -2096,8 +2096,7 @@
"enabled_services": [
"NetworkManager.service",
"firewalld.service",
"sshd.service",
"fdo-client-linuxapp.service"
"sshd.service"
]
}
},

3
test/data/manifests/rhel_85-x86_64-edge_container-boot.json
View file

@ -2014,8 +2014,7 @@
"enabled_services": [
"NetworkManager.service",
"firewalld.service",
"sshd.service",
"fdo-client-linuxapp.service"
"sshd.service"
]
}
},