Fix patch
The patch didn't apply because the file has changed
This commit is contained in:
parent
d5cd5a0bb6
commit
de40d0571f
1 changed files with 11 additions and 7 deletions
|
|
@ -1,19 +1,23 @@
|
|||
diff --git a/tests/probes/sysctl/test_sysctl_probe_all.sh b/tests/probes/sysctl/test_sysctl_probe_all.sh
|
||||
index bc9513347..2f17adc8b 100755
|
||||
index 2280ff7ae..c79d7ed18 100755
|
||||
--- a/tests/probes/sysctl/test_sysctl_probe_all.sh
|
||||
+++ b/tests/probes/sysctl/test_sysctl_probe_all.sh
|
||||
@@ -73,10 +73,14 @@ if [ "$procps_ver" != "$lowest_ver" ]; then
|
||||
@@ -73,6 +73,10 @@ if [ "$procps_ver" != "$lowest_ver" ]; then
|
||||
sed -i '/.*vm.stat_refresh/d' "$sysctlNames"
|
||||
fi
|
||||
|
||||
+if ! grep -q "hugepages" "$ourNames"; then
|
||||
+ sed -i "/^.*hugepages.*$/d" "$sysctlNames"
|
||||
+fi
|
||||
+
|
||||
echo "Diff (sysctlNames / ourNames): ------"
|
||||
diff "$sysctlNames" "$ourNames"
|
||||
|
||||
# remove oscap error message related to permissions from stderr
|
||||
sed -i -E "/^E: oscap: +Can't read sysctl value from /d" "$stderr"
|
||||
echo "-------------------------------------"
|
||||
@@ -84,6 +88,7 @@ sed -i -E "/^E: oscap: +Can't read sysctl value from /d" "$stderr"
|
||||
# that can't fit into 8K buffer and result in errno 14
|
||||
# (for example /proc/sys/kernel/spl/hostid could be the case)
|
||||
sed -i -E "/^E: oscap: +An error.*14, Bad address/d" "$stderr"
|
||||
+sed -i "/^.*hugepages.*$/d" "$stderr"
|
||||
[ ! -s $stderr ]
|
||||
|
||||
rm $stderr $result $ourNames $sysctlNames
|
||||
echo "Errors (without messages related to permissions):"
|
||||
cat "$stderr"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue