Merge pull request #2201 from jan-cerny/remove_oscap_bootc_build

Remove OSCAP_BOOTC_BUILD environment variable
OpenSCAP · Feb 14, 2025 · 4fda084 · 4fda084
2 parents 0e2f9f5 + 4c3c309
commit 4fda084
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 106 deletions.
diff --git a/src/XCCDF_POLICY/xccdf_policy_remediate.c b/src/XCCDF_POLICY/xccdf_policy_remediate.c
@@ -464,14 +464,8 @@ static inline int _xccdf_fix_execute(struct xccdf_rule_result *rr, struct xccdf_
 				NULL
 			};
 
-			char *oscap_bootc_build = getenv("OSCAP_BOOTC_BUILD");
-			char *oscap_bootc_build_kvarg = NULL;
-			if (oscap_bootc_build != NULL) {
-				oscap_bootc_build_kvarg = oscap_sprintf("OSCAP_BOOTC_BUILD=%s", oscap_bootc_build);
-			}
-			char *const envp[3] = {
+			char *const envp[2] = {
 				"PATH=/bin:/sbin:/usr/bin:/usr/sbin",
-				oscap_bootc_build_kvarg,
 				NULL
 			};
 

diff --git a/tests/API/XCCDF/unittests/CMakeLists.txt b/tests/API/XCCDF/unittests/CMakeLists.txt
@@ -111,4 +111,3 @@ add_oscap_test("test_no_newline_between_select_elements.sh")
 add_oscap_test("test_single_line_tailoring.sh")
 add_oscap_test("test_reference.sh")
 add_oscap_test("test_remediation_bootc.sh")
-add_oscap_test("test_oscap_bootc_pass_down.sh")
diff --git a/tests/API/XCCDF/unittests/test_oscap_bootc_pass_down.ds.xml b/tests/API/XCCDF/unittests/test_oscap_bootc_pass_down.ds.xml
diff --git a/tests/API/XCCDF/unittests/test_oscap_bootc_pass_down.sh b/tests/API/XCCDF/unittests/test_oscap_bootc_pass_down.sh
diff --git a/utils/oscap-im b/utils/oscap-im
@@ -120,7 +120,7 @@ def scan_and_remediate(args):
     add_common_args(args, oscap_cmd)
     add_eval_args(args, oscap_cmd)
     oscap_cmd.append(args.data_stream)
-    env = {"OSCAP_PREFERRED_ENGINE": "SCE", "OSCAP_BOOTC_BUILD": "YES"}
+    env = {"OSCAP_PREFERRED_ENGINE": "SCE"}
     try:
         subprocess.run(oscap_cmd, env=env, check=True)
     except subprocess.CalledProcessError as e: