diff options
| -rw-r--r-- | perl-install/harddrake/sound.pm | 9 | ||||
| -rw-r--r-- | perl-install/install2.pm | 5 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm index cbf2f3ed0..5a65ff702 100644 --- a/perl-install/harddrake/sound.pm +++ b/perl-install/harddrake/sound.pm @@ -21,6 +21,7 @@ use run_program; use modules; use standalone; use list_modules; +use detect_devices; my $has_nvaudio = -x '/lib/modules/' . c::kernel_version() . '/'; @@ -259,4 +260,12 @@ initlevel 3 "))); } + +sub configure_sound_slots { + each_index { + modules::add_alias("sound-slot-$::i", $_->{driver}); + } getSoundDevices(); +} + + 1; diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 6662cd98d..06e0be85d 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -504,9 +504,8 @@ sub main { eval { modules::load("af_packet") }; - each_index { - modules::add_alias("sound-slot-$::i", $_->{driver}); - } modules::probe_category('multimedia/sound'); + require harddrake::sound; + harddrake::sound::configure_sound_slots(); #- needed very early for install_steps_gtk eval { $o->{mouse} = mouse::detect() } if !$o->{nomouseprobe} && !$o->{mouse} && !$::testing; diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index dd26fce10..8de24ec4a 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -827,7 +827,7 @@ sub summary { return N("Remote CUPS server"); #- fall back in case of something wrong. }; - my @sound_cards = (arch() =~ /ppc/ ? \&modules::load_category : \&modules::probe_category)->('multimedia/sound'); + my @sound_cards = getSoundDevices(); #- if no sound card are detected AND the user selected things needing a sound card, #- propose a special case for ISA cards |