summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-02-26 21:41:31 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-02-26 21:41:31 +0000
commitab468a0bddd333f206aca7b4d33ec74451267910 (patch)
tree3576d25b0b819da2645e80fb8a2a065330806ba6
parentf2c80a79f73daa02590dcd8ce828058fc6f85770 (diff)
downloaddrakx-backup-do-not-use-ab468a0bddd333f206aca7b4d33ec74451267910.tar
drakx-backup-do-not-use-ab468a0bddd333f206aca7b4d33ec74451267910.tar.gz
drakx-backup-do-not-use-ab468a0bddd333f206aca7b4d33ec74451267910.tar.bz2
drakx-backup-do-not-use-ab468a0bddd333f206aca7b4d33ec74451267910.tar.xz
drakx-backup-do-not-use-ab468a0bddd333f206aca7b4d33ec74451267910.zip
if no sound card are detected AND the user selected things needing a sound card, propose a special case for ISA cards
-rw-r--r--perl-install/install_steps_interactive.pm18
1 files changed, 17 insertions, 1 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index b263d6634..b81b2228d 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1024,6 +1024,21 @@ 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');
+
+ #- if no sound card are detected AND the user selected things needing a sound card,
+ #- propose a special case for ISA cards
+ my $isa_sound_card =
+ !@sound_cards && ($o->{compssUsersChoice}{GAMES} || $o->{compssUsersChoice}{AUDIO}) &&
+ sub {
+ if ($o->ask_yesorno('', _("Do you have an ISA sound card?"))) {
+ $o->do_pkgs->install('sndconfig');
+ $o->ask_warn('', _("Run \"sndconfig\" after installation to configure your sound card"));
+ } else {
+ $o->ask_warn('', _("No sound card detected. Try \"harddrake\" after installation"));
+ }
+ };
+
$o->ask_from_({
messages => _("Summary"),
cancel => '',
@@ -1037,7 +1052,8 @@ sub summary {
} grep { $_->{driver} eq 'hisax' } detect_devices::probeall()),
(map {
{ label => _("Sound card"), val => $_->{description} }
- } arch() !~ /ppc/ ? modules::get_that_type('sound') : modules::load_thiskind('sound')),
+ } @sound_cards),
+ if_($isa_sound_card, { label => _("Sound card"), clicked => $isa_sound_card }),
(map {
{ label => _("TV card"), val => $_->{description} }
} grep { $_->{driver} eq 'bttv' } detect_devices::probeall()),