diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-02-08 01:44:04 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-02-08 01:44:04 +0000 |
| commit | 0696632ae8c88e9538ba4580cd8bbbe85389d36d (patch) | |
| tree | c288fbd82360aea0f4d9c8cca5364c695b29d62d | |
| parent | 093d669468a5da81ae84365719c4f3b7909da025 (diff) | |
| download | drakx-0696632ae8c88e9538ba4580cd8bbbe85389d36d.tar drakx-0696632ae8c88e9538ba4580cd8bbbe85389d36d.tar.gz drakx-0696632ae8c88e9538ba4580cd8bbbe85389d36d.tar.bz2 drakx-0696632ae8c88e9538ba4580cd8bbbe85389d36d.tar.xz drakx-0696632ae8c88e9538ba4580cd8bbbe85389d36d.zip | |
make XFdrake startup be instantenous for non nv|ati cards (allowNVIDIA_rpms and
allowATI_rpms tests used to cost us 99% of the long startup time of XFdrake:-()
| -rw-r--r-- | perl-install/Xconfig/card.pm | 4 | ||||
| -rwxr-xr-x | perl-install/standalone/XFdrake | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm index 2759c6563..378c739cc 100644 --- a/perl-install/Xconfig/card.pm +++ b/perl-install/Xconfig/card.pm @@ -345,9 +345,9 @@ sub install_server { } #- 3D acceleration configuration for XFree 4 #- using NVIDIA driver (TNT, TN2 and GeForce cards only). - push @packages, @{$options->{allowNVIDIA_rpms}} if $card->{Driver2} eq 'nvidia' && $options->{allowNVIDIA_rpms}; + push @packages, @{$options->{allowNVIDIA_rpms}} if $card->{Driver2} eq 'nvidia' && $options->{allowNVIDIA_rpms}->(); #- using ATI fglrx driver (Radeon, Fire GL cards only). - push @packages, @{$options->{allowATI_rpms}} if $card->{Driver2} eq 'fglrx' && $options->{allowATI_rpms}; + push @packages, @{$options->{allowATI_rpms}} if $card->{Driver2} eq 'fglrx' && $options->{allowATI_rpms}->(); $do_pkgs->install(@packages) if @packages; -x "$::prefix$prog" or die "server $card->{server} is not available (should be in $::prefix$prog)"; diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake index 936cc7ab1..6f494899e 100755 --- a/perl-install/standalone/XFdrake +++ b/perl-install/standalone/XFdrake @@ -42,8 +42,8 @@ $configure_this ||= 'everything'; modules::mergein_conf('/etc/modules.conf') if -r '/etc/modules.conf'; my $rc = do { - my $options = { allowNVIDIA_rpms => $in->do_pkgs->check_kernel_module_packages('NVIDIA_kernel', 'NVIDIA_GLX'), - allowATI_rpms => $in->do_pkgs->check_kernel_module_packages('ATI_kernel', 'ATI_GLX'), + my $options = { allowNVIDIA_rpms => sub { $in->do_pkgs->check_kernel_module_packages('NVIDIA_kernel', 'NVIDIA_GLX') }, + allowATI_rpms => sub { $in->do_pkgs->check_kernel_module_packages('ATI_kernel', 'ATI_GLX') }, allowFB => listlength(cat_("/proc/fb")) }; if ($configure_this eq 'everything') { |