summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-09-14 12:35:30 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-09-14 12:35:30 +0000
commitd262062a7a03f6791dad8f30ffa51220cd29814a (patch)
treeb4f89f3af09907aab2e38f4f23c2638676fe54e2 /perl-install
parentd9f4685657b66bbbb0f4021a040da852c78d0482 (diff)
downloaddrakx-d262062a7a03f6791dad8f30ffa51220cd29814a.tar
drakx-d262062a7a03f6791dad8f30ffa51220cd29814a.tar.gz
drakx-d262062a7a03f6791dad8f30ffa51220cd29814a.tar.bz2
drakx-d262062a7a03f6791dad8f30ffa51220cd29814a.tar.xz
drakx-d262062a7a03f6791dad8f30ffa51220cd29814a.zip
no_comment
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/any.pm3
-rw-r--r--perl-install/install2.pm1
-rw-r--r--perl-install/modules.pm2
3 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 0eec3a2ed..850a3be52 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -489,9 +489,10 @@ sub load_module {
my ($in, $type) = @_;
my @options;
+ (my $msg_type = $type) =~ s/\|.*//;
my $m = $in->ask_from_listf('',
#-PO: the %s is the driver type (scsi, network, sound,...)
- _("Which %s driver should I try?", $type),
+ _("Which %s driver should I try?", $msg_type),
\&modules::module2text,
[ modules::module_of_type($type) ]) or return;
my $l = modules::module2text($m);
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 8ae9806aa..8ed5e4ab0 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -352,6 +352,7 @@ sub miscellaneous {
CLASS => $::expert && "expert" || $::beginner && "beginner" || "medium",
TYPE => $o->{installClass},
SECURITY => $o->{security},
+ LITTLE_OIGNONS_WELL_FRIED => 'PowerPack', # Desktop
});
my $f = "$o->{prefix}/etc/sysconfig/usb";
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 8fad8efba..b50b2467c 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -332,12 +332,12 @@ qw(
acenic sk98lin de4x5
BusLogic seagate fdomain g_NCR5380 dc395x_trm tmscsim
dpt_i2o eata eata_pio eata_dma
-apa1480_cb
aztcd gscd isp16 mcd mcdx optcd cm206 sjcd
);
my @skip_modules_on_stage1 = (
arch() =~ /alpha/ ? qw(sb1000) : (),
+ "apa1480_cb",
);