summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2004-01-22 15:15:09 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2004-01-22 15:15:09 +0000
commitc030bf98e35f440a83c619d9a74b74ce65a427ab (patch)
tree3e296621ab3ed484e02af624f1052551d40380ff
parent8fa2a7fd8903844336f91204878e40920dfb775e (diff)
downloaddrakx-backup-do-not-use-c030bf98e35f440a83c619d9a74b74ce65a427ab.tar
drakx-backup-do-not-use-c030bf98e35f440a83c619d9a74b74ce65a427ab.tar.gz
drakx-backup-do-not-use-c030bf98e35f440a83c619d9a74b74ce65a427ab.tar.bz2
drakx-backup-do-not-use-c030bf98e35f440a83c619d9a74b74ce65a427ab.tar.xz
drakx-backup-do-not-use-c030bf98e35f440a83c619d9a74b74ce65a427ab.zip
revive network.img, use an additional network_drivers.img, put back many discarded modules
-rw-r--r--kernel/modules.pl8
1 files changed, 3 insertions, 5 deletions
diff --git a/kernel/modules.pl b/kernel/modules.pl
index 9e7044e99..065c2ae71 100644
--- a/kernel/modules.pl
+++ b/kernel/modules.pl
@@ -17,14 +17,10 @@ my %modules_only_for_all_img = (
'network/main' => [
qw(olympic acenic),
qw(aironet4500_card com20020-pci hamachi starfire winbond-840),
- qw(fealnx 3c990 3c990fx prism2_plx dgrs),
# token ring
qw(tmspci ibmtr abyss),
- qw(3c501 3c503 3c505 3c507 3c515), # unused, hopefully?
- qw(eepro 82596 de620 depca ewrk3 cs89x0),
-
if_(arch() =~ /x86_64/, qw(orinoco_plx)), # don't support laptop for now
if_(arch() =~ /x86_64/, qw(hp100 epic100)), # old (nico)
if_(arch() =~ /alpha|ppc/, qw(sb1000)),
@@ -105,6 +101,8 @@ my @modules_removed_from_stage1 = flatten_and_check(\%modules_removed_from_stage
my %images = (
pcmcia => 'fs/cdrom disk/cdrom|raw|pcmcia bus/pcmcia',
cdrom => 'fs/cdrom disk/cdrom|raw|scsi',
+ network => 'bus/usb|pcmcia fs/network',
+ network_drivers => 'network/main|pcmcia|usb|raw|gigabit',
all => 'fs/cdrom disk/cdrom|raw bus/usb disk/usb|scsi fs/loopback|local bus/pcmcia disk/pcmcia|hardware_raid fs/network network/main|pcmcia|usb|raw|gigabit bus/firewire disk/firewire',
);
@@ -115,7 +113,7 @@ pci_modules4stage1($1) if "@ARGV" =~ /pci_modules4stage1:(.*)/;
sub images {
while (my ($image, $l) = each %images) {
- my @modules = @modules_always_on_stage1;
+ my @modules = if_($image !~ /drivers/, @modules_always_on_stage1);
foreach (split(' ', $l)) {
push @modules, category2modules($_);
}