From 8be9f7c0f3aa5a37e79e72434d225a101ae005fe Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 6 May 2004 08:32:17 +0000
Subject: when XF86Config-4 is missing, use XF86Config

---
 move/move.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'move')

diff --git a/move/move.pm b/move/move.pm
index b02100c83..d9881f566 100644
--- a/move/move.pm
+++ b/move/move.pm
@@ -698,7 +698,9 @@ sub automatic_xconf {
 
     modules::load_category('various/agpgart'); 
 
-    my ($Driver) = cat_('/etc/X11/XF86Config-4') =~ /Section "Device".*Driver\s*"(.*?)"/s;
+    my $file = '/etc/X11/XF86Config';
+    $file = "$file-4" if -e "$file-4";
+    my ($Driver) = cat_($file) =~ /Section "Device".*Driver\s*"(.*?)"/s;
     if ($Driver eq 'nvidia') {
         modules::load('nvidia');
 	lomount_clp('nvidia', '/usr/lib/libGLcore.so.1');
-- 
cgit v1.2.1