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

manifest/os: implicitly include selinux policy package

Browse source
This commit is contained in:
Tom Gundersen 2022-07-06 00:59:33 +01:00
parent 1e03627447
commit d791138b27
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/distro/fedora/package_sets.go
View file

@ -16,7 +16,6 @@ func ec2CommonPackageSet(t *imageType) rpmmd.PackageSet {
Include: []string{
"@core",
"chrony",
"selinux-policy-targeted",
"langpacks-en",
"libxcrypt-compat",
"xfsprogs",
@ -39,7 +38,6 @@ func qcow2CommonPackageSet(t *imageType) rpmmd.PackageSet {
"@Fedora Cloud Server",
"chrony",
"systemd-udev",
"selinux-policy-targeted",
"langpacks-en",
},
Exclude: []string{
@ -64,7 +62,6 @@ func vhdCommonPackageSet(t *imageType) rpmmd.PackageSet {
Include: []string{
"@core",
"chrony",
"selinux-policy-targeted",
"langpacks-en",
"net-tools",
"ntfsprogs",
@ -90,7 +87,6 @@ func vmdkCommonPackageSet(t *imageType) rpmmd.PackageSet {
"@Fedora Cloud Server",
"chrony",
"systemd-udev",
"selinux-policy-targeted",
"langpacks-en",
},
Exclude: []string{
@ -115,7 +111,6 @@ func openstackCommonPackageSet(t *imageType) rpmmd.PackageSet {
Include: []string{
"@core",
"chrony",
"selinux-policy-targeted",
"spice-vdagent",
"qemu-guest-agent",
"xen-libs",
@ -184,7 +179,6 @@ func iotCommitPackageSet(t *imageType) rpmmd.PackageSet {
"procps-ng",
"rootfiles",
"rpm",
"selinux-policy-targeted",
"smartmontools-selinux",
"setup",
"shadow-utils",

4
internal/manifest/os.go
View file

@ -152,6 +152,10 @@ func (p *OSPipeline) getPackageSetChain() []rpmmd.PackageSet {
packages = append(packages, "chrony")
}
if p.SElinux != "" {
packages = append(packages, fmt.Sprintf("selinux-policy-%s", p.SElinux))
}
chain := []rpmmd.PackageSet{
{
Include: append(packages, p.ExtraBasePackages...),