diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-07-04 22:25:15 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-07-04 22:25:15 +0000 |
| commit | 9602001c7823079a8e8ca0e737a8fe2f6c0db0d2 (patch) | |
| tree | 6a4a4b5bb040972c82f8f23a7f154b7631d95591 /perl-install/install_steps_interactive.pm | |
| parent | b5b714420602230508f199cb392d21c4410a4f1d (diff) | |
| download | drakx-backup-do-not-use-9602001c7823079a8e8ca0e737a8fe2f6c0db0d2.tar drakx-backup-do-not-use-9602001c7823079a8e8ca0e737a8fe2f6c0db0d2.tar.gz drakx-backup-do-not-use-9602001c7823079a8e8ca0e737a8fe2f6c0db0d2.tar.bz2 drakx-backup-do-not-use-9602001c7823079a8e8ca0e737a8fe2f6c0db0d2.tar.xz drakx-backup-do-not-use-9602001c7823079a8e8ca0e737a8fe2f6c0db0d2.zip | |
adapt to new modules.pm
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 9788ef93b..74be30c3e 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -290,10 +290,10 @@ sub selectMouse { } if ($o->{mouse}{device} eq "usbmouse") { - any::setup_thiskind($o, 'usb', !$::expert, 1, $o->{pcmcia}); + any::load_category($o, 'bus/usb', !$::expert, 1, $o->{pcmcia}); eval { devices::make("usbmouse"); - modules::load($_) foreach qw(hid mousedev usbmouse); + modules::load(qw(hid mousedev usbmouse)); }; } @@ -314,9 +314,9 @@ sub setupSCSI { } { my $w = $o->wait_message(_("IDE"), _("Configuring IDE")); - modules::load_ide(); + modules::load_category('disk/cdrom'); } - any::setup_thiskind($o, 'scsi|disk', !$::expert && !$clicked, 0, $o->{pcmcia}); + any::load_category($o, 'disk/scsi|hardware_raid', !$::expert && !$clicked, 0, $o->{pcmcia}); install_interactive::tellAboutProprietaryModules($o) if !$clicked; } @@ -998,7 +998,7 @@ sub summary { return _("Remote CUPS server"); #- fall back in case of something wrong. }; - my @sound_cards = arch() !~ /ppc/ ? modules::get_that_type('sound') : modules::load_thiskind('sound'); + my @sound_cards = (arch() =~ /ppc/ ? \&modules::load_category : \&modules::probe_category)->('multimedia/sound'); #- if no sound card are detected AND the user selected things needing a sound card, #- propose a special case for ISA cards |