summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-05-22 10:27:02 -0400
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-01-02 14:58:44 +0100
commit5ae47dfaae2d9098ce146b3acf5b105179791c52 (patch)
tree5196e21cb18f96b80b3b3858abe24b6a0df75130 /perl-install
parent059b63602f3fabb23b15ef48bd617e0d323b5ba4 (diff)
downloaddrakx-5ae47dfaae2d9098ce146b3acf5b105179791c52.tar
drakx-5ae47dfaae2d9098ce146b3acf5b105179791c52.tar.gz
drakx-5ae47dfaae2d9098ce146b3acf5b105179791c52.tar.bz2
drakx-5ae47dfaae2d9098ce146b3acf5b105179791c52.tar.xz
drakx-5ae47dfaae2d9098ce146b3acf5b105179791c52.zip
drop support for ISApnp sound cards
obsolete for years
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/steps_interactive.pm18
-rwxr-xr-xperl-install/standalone/draksound5
4 files changed, 5 insertions, 22 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 89126549a..342eb1f0a 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -5,6 +5,8 @@
- drakboot:
o skip swap in the list of partitions (mga#15767)
o split drakautologin from drakboot (mga#7160)
+- draksound:
+ o drop support for ISApnp sound cards
Version 17.8 - 22 December 2015
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 885a38ce6..f335d4a82 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -3,6 +3,8 @@
- partitioning:
o auto fill LV name from mntpnt (mga#5407)
o suggest "lv_foo" instead of just "foo" for LVname
+- summary:
+ o drop support for ISApnp sound cards
- fix a message (mga#51414)
- misc cleanups
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index e32ed6e64..6aba0581b 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -943,24 +943,6 @@ sub summary {
$sound_index++;
}
- if (!@sound_cards && ($o->{rpmsrate_flags_chosen}{CAT_GAMES} || $o->{rpmsrate_flags_chosen}{CAT_AUDIO})) {
- #- if no sound card are detected AND the user selected things needing a sound card,
- #- propose a special case for ISA cards
- push @l, {
- group => N("Hardware"),
- label => N("Sound card"),
- val => sub {},
- clicked => sub {
- if ($o->ask_yesorno('', N("Do you have an ISA sound card?"))) {
- $o->do_pkgs->install(qw(alsa-utils sndconfig aoss));
- $o->ask_warn('', N("Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound card"));
- } else {
- $o->ask_warn('', N("No sound card detected. Try \"harddrake\" after installation"));
- }
- },
- };
- }
-
push @l, {
group => N("Hardware"),
label => N("Graphical interface"),
diff --git a/perl-install/standalone/draksound b/perl-install/standalone/draksound
index a51dffbca..bc3d1b32b 100755
--- a/perl-install/standalone/draksound
+++ b/perl-install/standalone/draksound
@@ -48,10 +48,7 @@ if (my @devices = detect_devices::probe_category('multimedia/sound')) {
$in->ask_warn(N("No Sound Card detected!"),
formatAlaTeX(
#-PO: keep the double empty lines between sections, this is formatted a la LaTeX
- N("No Sound Card has been detected on your machine. Please verify that a Linux-supported Sound Card is correctly plugged in") .
-
-
-N("\n\n\nNote: if you've an ISA PnP sound card, you'll have to use the alsaconf or the sndconfig program. Just type \"alsaconf\" or \"sndconfig\" in a console.")));
+ N("No Sound Card has been detected on your machine. Please verify that a Linux-supported Sound Card is correctly plugged in")));
}
$modules_conf->write;