adamwill / rpms / openscap

Forked from rpms/openscap 3 years ago
Clone

Blame SOURCES/openscap-1.2.14-sysctl-test-s390x-PR-726.patch

4e2b27
From 83342658ceb4230c218b0b47046ca6bb8e239f62 Mon Sep 17 00:00:00 2001
4e2b27
From: Marek Haicman <mhaicman@redhat.com>
4e2b27
Date: Mon, 24 Apr 2017 10:05:59 +0200
4e2b27
Subject: [PATCH] Fixing sysctl test on s390 architecture
4e2b27
4e2b27
---
4e2b27
 tests/probes/sysctl/test_sysctl_probe_all.sh | 3 ++-
4e2b27
 1 file changed, 2 insertions(+), 1 deletion(-)
4e2b27
4e2b27
diff --git a/tests/probes/sysctl/test_sysctl_probe_all.sh b/tests/probes/sysctl/test_sysctl_probe_all.sh
4e2b27
index 1b725231d..fa3539255 100755
4e2b27
--- a/tests/probes/sysctl/test_sysctl_probe_all.sh
4e2b27
+++ b/tests/probes/sysctl/test_sysctl_probe_all.sh
4e2b27
@@ -22,7 +22,8 @@ $OSCAP oval eval --results $result $srcdir/test_sysctl_probe_all.oval.xml > /dev
4e2b27
 
4e2b27
 # sysctl has duplicities in output
4e2b27
 # hide permission errors like: "sysctl: permission denied on key 'fs.protected_hardlinks'"
4e2b27
-sysctl -aN --deprecated 2> /dev/null | sort -u > "$sysctlNames"
4e2b27
+# kernel parameters might use "/" and "." separators interchangeably - normalizing
4e2b27
+sysctl -aN --deprecated 2> /dev/null | tr "/" "." | sort -u > "$sysctlNames"
4e2b27
 
4e2b27
 grep unix-sys:name "$result" | sed -E 's;.*>(.*)<.*;\1;g' | sort > "$ourNames"
4e2b27