diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-02-08 13:29:19 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-02-08 13:29:19 +0000 |
| commit | 11167f7fda2bdce1107906ff004f35accf5fb3b9 (patch) | |
| tree | af485611bf8355a704659e68f96ff9a54cd8e370 | |
| parent | cf188d2daa0f220ced942d155dfb65c4d8e6e3e1 (diff) | |
| download | drakx-11167f7fda2bdce1107906ff004f35accf5fb3b9.tar drakx-11167f7fda2bdce1107906ff004f35accf5fb3b9.tar.gz drakx-11167f7fda2bdce1107906ff004f35accf5fb3b9.tar.bz2 drakx-11167f7fda2bdce1107906ff004f35accf5fb3b9.tar.xz drakx-11167f7fda2bdce1107906ff004f35accf5fb3b9.zip | |
adapt to change allowing checking nvidia/ati proprietary driver availability only when needed
| -rw-r--r-- | move/move.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/move/move.pm b/move/move.pm index 01823fa98..fd20c558d 100644 --- a/move/move.pm +++ b/move/move.pm @@ -685,7 +685,7 @@ sub automatic_xconf { require Xconfig::main; require class_discard; Xconfig::main::configure_everything_auto_install($o->{raw_X}, class_discard->new, {}, - { allowNVIDIA_rpms => [], allowATI_rpms => [], allowFB => $o->{allowFB} }); + { allowNVIDIA_rpms => sub { [] }, allowATI_rpms => sub { [] }, allowFB => $o->{allowFB} }); my $card = Xconfig::card::from_raw_X($o->{raw_X}); } diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 384f54d44..289250cdc 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -1252,8 +1252,8 @@ sub configureX { my $options = { allowFB => $o->{allowFB}, - allowNVIDIA_rpms => $o->do_pkgs->check_kernel_module_packages('NVIDIA_kernel', 'NVIDIA_GLX'), - allowATI_rpms => $o->do_pkgs->check_kernel_module_packages('ATI_kernel', 'ATI_GLX'), + allowNVIDIA_rpms => sub { $o->do_pkgs->check_kernel_module_packages('NVIDIA_kernel', 'NVIDIA_GLX') }, + allowATI_rpms => sub { $o->do_pkgs->check_kernel_module_packages('ATI_kernel', 'ATI_GLX') }, }; require Xconfig::main; |