summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2005-10-06 12:06:44 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2005-10-06 12:06:44 +0000
commit2f463ea9864f1ad8a45e90f7200761b225075ca1 (patch)
tree7c5621328eb6ea4272290602375b3d864a0e194c
parent73285b1e3babd3de48549233eb35360605eda473 (diff)
downloaddrakx-2f463ea9864f1ad8a45e90f7200761b225075ca1.tar
drakx-2f463ea9864f1ad8a45e90f7200761b225075ca1.tar.gz
drakx-2f463ea9864f1ad8a45e90f7200761b225075ca1.tar.bz2
drakx-2f463ea9864f1ad8a45e90f7200761b225075ca1.tar.xz
drakx-2f463ea9864f1ad8a45e90f7200761b225075ca1.zip
(libgl_config)
- handle nvidia_legacy - don't create files (and thus don't run ldconfig when not needed)
-rw-r--r--perl-install/Xconfig/card.pm10
1 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm
index 0dfc78e87..dbf1d9954 100644
--- a/perl-install/Xconfig/card.pm
+++ b/perl-install/Xconfig/card.pm
@@ -347,7 +347,7 @@ sub install_server {
}
$card->{REMOVE_GLX} ||= "$modules_dir/extensions/nvidia/libglx.so";
- libgl_config($card->{Driver});
+ libgl_config($card);
if ($card->{need_MATROX_HAL}) {
require Xconfig::proprietary;
@@ -465,18 +465,20 @@ sub set_glx_restrictions {
}
sub libgl_config {
- my ($Driver) = @_;
+ my ($card) = @_;
my $dir = "$::prefix/etc/ld.so.conf.d";
my $comment = '# commented-by-DrakX ';
my %driver_to_libgl_config = (
- nvidia => 'nvidia.conf',
+ nvidia => $card->{NVIDIA_LEGACY} ? 'nvidia_legacy.conf' : 'nvidia.conf',
+ nvidia_other => !$card->{NVIDIA_LEGACY} ? 'nvidia_legacy.conf' : 'nvidia.conf',
fglrx => 'ati.conf',
);
my $need_to_run_ldconfig;
- my $wanted = $driver_to_libgl_config{$Driver};
+ my $wanted = $driver_to_libgl_config{$card->{Driver}};
foreach my $file (values %driver_to_libgl_config) {
+ next if !-e "$dir/$file";
substInFile {
my ($commented, $s) = /^(\Q$comment\E)?(.*)/;
if ($file eq $wanted) {