summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-05-06 08:32:17 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-05-06 08:32:17 +0000
commit8be9f7c0f3aa5a37e79e72434d225a101ae005fe (patch)
treeb8048d2744857bbd8fe42505dd9368584549c54b
parent43ea3670136da2f5f65d0574da330712261246b7 (diff)
downloaddrakx-backup-do-not-use-8be9f7c0f3aa5a37e79e72434d225a101ae005fe.tar
drakx-backup-do-not-use-8be9f7c0f3aa5a37e79e72434d225a101ae005fe.tar.gz
drakx-backup-do-not-use-8be9f7c0f3aa5a37e79e72434d225a101ae005fe.tar.bz2
drakx-backup-do-not-use-8be9f7c0f3aa5a37e79e72434d225a101ae005fe.tar.xz
drakx-backup-do-not-use-8be9f7c0f3aa5a37e79e72434d225a101ae005fe.zip
when XF86Config-4 is missing, use XF86Config
-rw-r--r--move/move.pm4
1 files changed, 3 insertions, 1 deletions
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');