From d262062a7a03f6791dad8f30ffa51220cd29814a Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 14 Sep 2000 12:35:30 +0000
Subject: no_comment

---
 docs/README              | 12 ++++++++++++
 perl-install/any.pm      |  3 ++-
 perl-install/install2.pm |  1 +
 perl-install/modules.pm  |  2 +-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/docs/README b/docs/README
index aaf339ced..2b4be2372 100644
--- a/docs/README
+++ b/docs/README
@@ -77,11 +77,23 @@ Mandrake/base/mdkinst_stage2.gz
 
 images/*.img
 	boot images to use with DrakX. Use:
+	- all for everything, but need 2.88MB media (like el torito cdrom boot)
 	- hd for hard-disk install
 	- cdrom for cdrom install
 	- network for ftp/nfs install
 	- pcmcia for pcmcia install (see ``PCMCIA install'' below for more)
 
+  the following modules have been removed from:
+          network.img: acenic sk98lin de4x5
+          cdrom.img and hd.img: BusLogic seagate fdomain g_NCR5380 dc395x_trm tmscsim
+          hd.img: dpt_i2o eata eata_pio eata_dma
+          cdrom.img: aztcd gscd isp16 mcd mcdx optcd cm206 sjcd 
+          pcmcia.img: apa1480_cb
+  they are now in "other.img", 
+
+  if you think one of those modules is used a lot, tell me, i may find some room
+  to put it back on the main floppies.
+	
 
 ********************************************************************************
 * logs *************************************************************************
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",
 );
 
 
-- 
cgit v1.2.1