Merge pull request openshift#1620 from coreosbot-releng/fcc-sync

NO-JIRA: Bump fedora-coreos-config
Prashanth684 · Sep 28, 2024 · b753d25 · b753d25
2 parents d1c6c4d + e6398a4
commit b753d25
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/common.yaml b/common.yaml
@@ -38,6 +38,11 @@ conditional-include:
     include: zram-no-defaults.yaml
   - if: osversion == "rhel-9.4"
     include: zram-no-defaults.yaml
+  # Packages specific to el9
+  - if: osversion == "c9s"
+    include: fedora-coreos-config/manifests/shared-el9.yaml
+  - if: osversion == "rhel-9.4"
+    include: fedora-coreos-config/manifests/shared-el9.yaml
 
 
 documentation: false

diff --git a/fedora-coreos-config b/fedora-coreos-config
diff --git a/overlay.d/07fix-selinux-labels b/overlay.d/07fix-selinux-labels
@@ -0,0 +1 @@
+../fedora-coreos-config/overlay.d/07fix-selinux-labels
+1 −19		kola-denylist.yaml
+29 −29		manifest-lock.aarch64.json
+11 −1		manifest-lock.overrides.yaml
+28 −28		manifest-lock.ppc64le.json
+28 −28		manifest-lock.s390x.json
+30 −30		manifest-lock.x86_64.json
+2 −8		manifests/fedora-coreos-base.yaml
+0 −3		manifests/networking-tools.yaml
+8 −0		manifests/shared-el10.yaml
+7 −0		manifests/shared-el9.yaml
+2 −0		manifests/shared-workarounds.yaml
+0 −1		manifests/user-experience.yaml
+8 −0		overlay.d/07fix-selinux-labels/usr/lib/systemd/system-preset/40-fix-selinux-labels.preset
+16 −0		overlay.d/07fix-selinux-labels/usr/lib/systemd/system/coreos-fix-selinux-labels.service
+165 −0		overlay.d/07fix-selinux-labels/usr/libexec/coreos-fix-selinux-labels
+11 −0		overlay.d/README.md
+1 −1		tests/kola/security/coreos-update-ca-trust/test.sh
+50 −0		tests/kola/selinux/file-context-policy-match
+0 −0		tests/kola/selinux/unmodified-policy
+45 −0		tests/kola/upgrade/extended/test.sh
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../fedora-coreos-config/overlay.d/07fix-selinux-labels