diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-06-17 07:46:13 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-06-17 07:46:13 +0000 |
| commit | ffca7332b6138a49762a10e80809dbbb9368aa85 (patch) | |
| tree | 16a2f116ee352355d2b3b5912b9fb129c01554f3 /perl-install/Xconfig/card.pm | |
| parent | 6e2139313ad2da86fb1666bbc33bb4e668641a81 (diff) | |
| download | drakx-ffca7332b6138a49762a10e80809dbbb9368aa85.tar drakx-ffca7332b6138a49762a10e80809dbbb9368aa85.tar.gz drakx-ffca7332b6138a49762a10e80809dbbb9368aa85.tar.bz2 drakx-ffca7332b6138a49762a10e80809dbbb9368aa85.tar.xz drakx-ffca7332b6138a49762a10e80809dbbb9368aa85.zip | |
(install_server) remove proprietary gl libraries when configuring a non
ATI/NVIDIA card and redo ldconfig cache accordingly
Diffstat (limited to 'perl-install/Xconfig/card.pm')
| -rw-r--r-- | perl-install/Xconfig/card.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm index ee467fcd5..8e47b3205 100644 --- a/perl-install/Xconfig/card.pm +++ b/perl-install/Xconfig/card.pm @@ -387,9 +387,11 @@ sub install_server { if (my $file = $driver_to_libgl_config{$card->{Driver2}}) { if (-e $file) { symlinkf($file, "/etc/ld.so.conf.d/GL.conf"); - system("/sbin/ldconfig") if $::isStandalone } + } else { + eval { rm_rf("/etc/ld.so.conf.d/GL.conf") }; } + system("/sbin/ldconfig") if $::isStandalone; if ($card->{Driver2} eq 'fglrx' && -e "$::prefix/usr/X11R6/lib/modules/dri/fglrx_dri.so" && -e "$::prefix/usr/X11R6/lib/modules/drivers/fglrx_drv.o") { |