summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>2019-05-10 08:40:05 +0200
committerBenjamin Tissoires <benjamin.tissoires@redhat.com>2019-05-10 10:43:53 +0200
commit53c7796e8ddc6aaaef79df8c852c0d9d151a8559 (patch)
tree9f0930845c1af2d86cc1af6a3f5291a7477a0f3a
parent634dae745cf71c257554b4c18bde7710cd1716e8 (diff)
Refuse to run on UEFI machines running older kernels
Prior to kernel v3.12, the efi framebuffer driver was named "efifb". This cause problem on RHEL 7 as the base kernel is 3.10. "efi-framebuffer.0" was added by commit 2645e0aa for that reason (don't run on UEFI machine). The change from "efifb" to "efi-framebuffer" was done with commit e6816a8 in the kernel Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> [ofourdan: updated commit message with commit references] Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
-rw-r--r--src/vesa.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/vesa.c b/src/vesa.c
index 7f11175..0c1d003 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -452,7 +452,8 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev,
ScrnInfoPtr pScrn;
#ifdef __linux__
- if (access("/sys/devices/platform/efi-framebuffer.0", F_OK) == 0) {
+ if (access("/sys/devices/platform/efi-framebuffer.0", F_OK) == 0 ||
+ access("/sys/devices/platform/efifb.0", F_OK) == 0) {
ErrorF("vesa: Refusing to run on UEFI\n");
return FALSE;
}