115 lines
5.1 KiB
Diff
115 lines
5.1 KiB
Diff
From 996e85b4f8855af92c587ed562ebe7cf7105e2f0 Mon Sep 17 00:00:00 2001
|
|
From: Josue David Hernandez Gutierrez <josue.d.hernandez@oracle.com>
|
|
Date: Fri, 17 Oct 2025 01:15:38 +0000
|
|
Subject: [PATCH 10/10] Oscap customization for Oracle Linux
|
|
|
|
Signed-off-by: Josue David Hernandez Gutierrez <josue.d.hernandez@oracle.com>
|
|
---
|
|
.../data/distrodefs/rhel-10/imagetypes.yaml | 5 +++++
|
|
.../data/distrodefs/rhel-8/imagetypes.yaml | 5 +++++
|
|
.../data/distrodefs/rhel-9/imagetypes.yaml | 5 +++++
|
|
.../images/pkg/customizations/oscap/oscap.go | 21 +++++++++++++------
|
|
4 files changed, 30 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/vendor/github.com/osbuild/images/data/distrodefs/rhel-10/imagetypes.yaml b/vendor/github.com/osbuild/images/data/distrodefs/rhel-10/imagetypes.yaml
|
|
index 1e9f114..8cea1b9 100644
|
|
--- a/vendor/github.com/osbuild/images/data/distrodefs/rhel-10/imagetypes.yaml
|
|
+++ b/vendor/github.com/osbuild/images/data/distrodefs/rhel-10/imagetypes.yaml
|
|
@@ -749,6 +749,11 @@ image_config:
|
|
distro_name: "centos"
|
|
shallow_merge:
|
|
default_oscap_datastream: "/usr/share/xml/scap/ssg/content/ssg-cs10-ds.xml"
|
|
+ "oscap needs a different path on Oracle linux":
|
|
+ when:
|
|
+ distro_name: "ol"
|
|
+ shallow_merge:
|
|
+ default_oscap_datastream: "/usr/share/xml/scap/ssg/content/ssg-ol10-ds.xml"
|
|
|
|
image_types:
|
|
# XXX: not a real pkgset but the "os" pipeline pkgset for image-installer
|
|
diff --git a/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml b/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml
|
|
index 67a189d..af6a4bf 100644
|
|
--- a/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml
|
|
+++ b/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml
|
|
@@ -1251,6 +1251,11 @@ image_config:
|
|
distro_name: "centos"
|
|
shallow_merge:
|
|
default_oscap_datastream: "/usr/share/xml/scap/ssg/content/ssg-centos8-ds.xml"
|
|
+ "oscap needs a different path on Oracle linux":
|
|
+ when:
|
|
+ distro_name: "ol"
|
|
+ shallow_merge:
|
|
+ default_oscap_datastream: "/usr/share/xml/scap/ssg/content/ssg-ol8-ds.xml"
|
|
|
|
image_types:
|
|
# XXX: not a real pkgset but the "os" pipeline pkgset for image-installer
|
|
diff --git a/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml b/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml
|
|
index ca61d0d..78735c7 100644
|
|
--- a/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml
|
|
+++ b/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml
|
|
@@ -1213,6 +1213,11 @@ image_config:
|
|
distro_name: "centos"
|
|
shallow_merge:
|
|
default_oscap_datastream: "/usr/share/xml/scap/ssg/content/ssg-cs9-ds.xml"
|
|
+ "oscap needs a different path on Oracle linux":
|
|
+ when:
|
|
+ distro_name: "ol"
|
|
+ shallow_merge:
|
|
+ default_oscap_datastream: "/usr/share/xml/scap/ssg/content/ssg-ol9-ds.xml"
|
|
|
|
image_types:
|
|
# XXX: not a real pkgset but the "os" pipeline pkgset for image-installer
|
|
diff --git a/vendor/github.com/osbuild/images/pkg/customizations/oscap/oscap.go b/vendor/github.com/osbuild/images/pkg/customizations/oscap/oscap.go
|
|
index 59fba61..889f20a 100644
|
|
--- a/vendor/github.com/osbuild/images/pkg/customizations/oscap/oscap.go
|
|
+++ b/vendor/github.com/osbuild/images/pkg/customizations/oscap/oscap.go
|
|
@@ -41,6 +41,9 @@ const (
|
|
defaultCentos8Datastream string = "/usr/share/xml/scap/ssg/content/ssg-centos8-ds.xml"
|
|
defaultCentos9Datastream string = "/usr/share/xml/scap/ssg/content/ssg-cs9-ds.xml"
|
|
defaultCentos10Datastream string = "/usr/share/xml/scap/ssg/content/ssg-cs10-ds.xml"
|
|
+ defaultOL8Datastream string = "/usr/share/xml/scap/ssg/content/ssg-ol8-ds.xml"
|
|
+ defaultOL9Datastream string = "/usr/share/xml/scap/ssg/content/ssg-ol9-ds.xml"
|
|
+ defaultOL10Datastream string = "/usr/share/xml/scap/ssg/content/ssg-ol10-ds.xml"
|
|
defaultRHEL8Datastream string = "/usr/share/xml/scap/ssg/content/ssg-rhel8-ds.xml"
|
|
defaultRHEL9Datastream string = "/usr/share/xml/scap/ssg/content/ssg-rhel9-ds.xml"
|
|
defaultRHEL10Datastream string = "/usr/share/xml/scap/ssg/content/ssg-rhel10-ds.xml"
|
|
@@ -127,23 +130,29 @@ func DefaultFedoraDatastream() string {
|
|
return defaultFedoraDatastream
|
|
}
|
|
|
|
-func DefaultRHEL8Datastream(isRHEL bool) string {
|
|
- if isRHEL {
|
|
+func DefaultRHEL8Datastream(name string) string {
|
|
+ if strings.HasPrefix(name, "rhel") {
|
|
return defaultRHEL8Datastream
|
|
+ } else if strings.HasPrefix(name, "ol") {
|
|
+ return defaultOL8Datastream
|
|
}
|
|
return defaultCentos8Datastream
|
|
}
|
|
|
|
-func DefaultRHEL9Datastream(isRHEL bool) string {
|
|
- if isRHEL {
|
|
+func DefaultRHEL9Datastream(name string) string {
|
|
+ if strings.HasPrefix(name, "rhel") {
|
|
return defaultRHEL9Datastream
|
|
+ } else if strings.HasPrefix(name, "ol") {
|
|
+ return defaultOL9Datastream
|
|
}
|
|
return defaultCentos9Datastream
|
|
}
|
|
|
|
-func DefaultRHEL10Datastream(isRHEL bool) string {
|
|
- if isRHEL {
|
|
+func DefaultRHEL10Datastream(name string) string {
|
|
+ if strings.HasPrefix(name, "rhel") {
|
|
return defaultRHEL10Datastream
|
|
+ } else if strings.HasPrefix(name, "ol") {
|
|
+ return defaultOL10Datastream
|
|
}
|
|
return defaultCentos10Datastream
|
|
}
|
|
--
|
|
2.47.3
|
|
|