summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2016-06-29 15:11:23 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-07-11 20:33:29 +0200
commitbbef68785a0fffde63db82473991527929ec29f2 (patch)
tree1d4f2113748109945eb72daad59bba358e18c7d0
parent5ea33c3fc440fd3d1be0cd39b1a9953b06227d73 (diff)
downloaddrakx-kbd-mouse-x11-bbef68785a0fffde63db82473991527929ec29f2.tar
drakx-kbd-mouse-x11-bbef68785a0fffde63db82473991527929ec29f2.tar.gz
drakx-kbd-mouse-x11-bbef68785a0fffde63db82473991527929ec29f2.tar.bz2
drakx-kbd-mouse-x11-bbef68785a0fffde63db82473991527929ec29f2.tar.xz
drakx-kbd-mouse-x11-bbef68785a0fffde63db82473991527929ec29f2.zip
detect grub2 when checking for liveCD/DVD
-rw-r--r--NEWS3
-rw-r--r--tools/display_driver_helper2
2 files changed, 4 insertions, 1 deletions
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.