summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGE-LOG1
-rw-r--r--pts-core/functions/pts-functions-run.php4
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGE-LOG b/CHANGE-LOG
index 4437f34..512a8c4 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -7,6 +7,7 @@ Phoronix Test Suite (Git)
- pts-core: Fix RAM detection on Dell servers where "<OUT OF SPEC>" was string and then failed the XML to render (reported by pjwelsh)
- pts-core: Add "not specified" to HAL $remove_words
- pts-core: Rever trackerd from $check_process until better method is determined
+- pts-core: Fix read warnings in SELinux detection
- pts: Add gcc-g++ to external dependencies support for Cent OS and Fedora (reported by pjwelsh)
- pts: Report 2D EXA/XAA acceleration mode in the test notes when running gtkperf test
diff --git a/pts-core/functions/pts-functions-run.php b/pts-core/functions/pts-functions-run.php
index c4dbf91..103ea41 100644
--- a/pts-core/functions/pts-functions-run.php
+++ b/pts-core/functions/pts-functions-run.php
@@ -194,7 +194,7 @@ function pts_generate_test_notes($test_type)
pts_add_test_note(pts_process_running_string($check_processes));
// Check if Security Enhanced Linux was enforcing, permissive, or disabled
- if(is_file("/etc/sysconfig/selinux"))
+ if(is_file("/etc/sysconfig/selinux") && is_readable("/boot/grub/menu.lst"))
{
$selinux_file = file_get_contents("/etc/sysconfig/selinux");
if(stripos($selinux_file, "selinux=disabled") === false)
@@ -202,7 +202,7 @@ function pts_generate_test_notes($test_type)
pts_add_test_note("SELinux was enabled.");
}
}
- else if(is_file("/boot/grub/menu.lst"))
+ else if(is_file("/boot/grub/menu.lst") && is_readable("/boot/grub/menu.lst"))
{
$grub_file = file_get_contents("/boot/grub/menu.lst");
if(stripos($grub_file, "selinux=1") !== false)