From bbef68785a0fffde63db82473991527929ec29f2 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 29 Jun 2016 15:11:23 +0200 Subject: detect grub2 when checking for liveCD/DVD --- NEWS | 3 +++ tools/display_driver_helper | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 00ef39e..8d7098f 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +- display_driver_helper: + o detect grub2 when checking for liveCD/DVD + Version 1.13 - 10 July 2016 - Fix the X11 names for various layouts and variants (mga#18862) diff --git a/tools/display_driver_helper b/tools/display_driver_helper index 02cb123..8f842d5 100644 --- a/tools/display_driver_helper +++ b/tools/display_driver_helper @@ -253,7 +253,7 @@ check_xorg() { # the implicit driver, e.g. a proprietary one) # TODO: Could this be replaced with a more robust check? [ -e "/etc/X11/xorg.conf" ] || [ -e "/etc/sysconfig/harddrake2/kernels" ] || - [ -e "/etc/sysconfig/harddrake2/xorg" ] || [ -e "/boot/grub/menu.lst" ] + [ -e "/etc/sysconfig/harddrake2/xorg" ] || [ -e "/boot/grub/menu.lst" ] || [ -e "/boot/grub2/grub.cfg" ] } # Load the driver for the specified modalias, if configured. -- cgit v1.2.1