summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-09-05 17:54:02 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-09-05 17:54:02 +0000
commit83c808f36e57108ae50181ea4bf25c3ce8eb43ab (patch)
tree88628d98e55e4ff83ac3854ff89a504de0fd5b84
parentef22f0025543eefd769df4e8fa5a35d665998eb2 (diff)
downloaddrakx-83c808f36e57108ae50181ea4bf25c3ce8eb43ab.tar
drakx-83c808f36e57108ae50181ea4bf25c3ce8eb43ab.tar.gz
drakx-83c808f36e57108ae50181ea4bf25c3ce8eb43ab.tar.bz2
drakx-83c808f36e57108ae50181ea4bf25c3ce8eb43ab.tar.xz
drakx-83c808f36e57108ae50181ea4bf25c3ce8eb43ab.zip
no_comment
-rw-r--r--perl-install/modules.pm27
-rwxr-xr-xupdate_kernel8
2 files changed, 21 insertions, 14 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 6a2a5f2d0..2bcab65e6 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -140,6 +140,13 @@ arch() =~ /^sparc/ ? (
"qlogicisp" => "Qlogic ISP",
"sym53c8xx" => "Symbios 53c8xx",
}],
+[ 'scsi_raw', {
+ "scsi_mod" => "scsi_mod",
+ "sd_mod" => "sd_mod",
+ "ide-mod" => "ide-mod",
+ "ide-probe" => "ide-probe",
+#- "ide-probe-mod" => "ide-probe-mod",
+}],
[ 'disk', {
arch() =~ /^sparc/ ? (
"pluto" => "Sun SparcSTORAGE Array SCSI", #- name it "fc4:soc:pluto" ?
@@ -158,6 +165,9 @@ arch() =~ /^sparc/ ? (
"imm" => "Iomega Zip (new driver)",
),
}],
+[ 'disk_raw', {
+ "ide-disk" => "IDE disk",
+}],
[ 'cdrom', {
arch() !~ /^sparc|alpha/ ? (
"sbpcd" => "SoundBlaster/Panasonic",
@@ -173,6 +183,12 @@ arch() !~ /^sparc|alpha/ ? (
"sonycd535" => "Sony CDU-5xx",
) : (),
}],
+[ 'cdrom_raw', {
+ "isofs" => "iso9660",
+ "ide-cd" => "ide-cd",
+ "sr_mod" => "SCSI CDROM support",
+ "cdrom" => "cdrom",
+}],
[ 'sound', {
arch() !~ /^sparc/ ? (
"alsa" => "ALSA sound module, many sound cards",
@@ -290,16 +306,6 @@ arch() !~ /^sparc/ ? (
"ide-floppy" => "ide-floppy",
"ide-tape" => "ide-tape",
"nbd" => "nbd",
-
- "scsi_mod" => "scsi_mod",
- "sd_mod" => "sd_mod",
- "ide-mod" => "ide-mod",
- "ide-probe" => "ide-probe",
- "ide-disk" => "IDE disk",
- "isofs" => "iso9660",
- "ide-cd" => "ide-cd",
- "sr_mod" => "SCSI CDROM support",
- "cdrom" => "cdrom",
#- "ide-probe-mod" => "ide-probe-mod",
}],
);
@@ -327,6 +333,7 @@ while (my ($k, $v) = each %drivers) {
sub module_of_type__4update_kernel {
my ($type) = @_;
+ $type = join "|", map { $_, $_ . "_raw" } split ' ', $type;
my %skip; @skip{@skip_modules_on_stage1} = ();
grep { !exists $skip{$_} } grep { $drivers{$_}{type} =~ /^($type)$/ } keys %drivers;
}
diff --git a/update_kernel b/update_kernel
index 5572f89bf..ef122316e 100755
--- a/update_kernel
+++ b/update_kernel
@@ -8,10 +8,10 @@ function f() {
ARCH=`uname -m | sed -e 's/i.86/i386/' -e 's/sparc.*/sparc/'`
-f "scsi|disk" ; SCSI_DRIVERS=$v
-f "net|network" ; NETWORK_DRIVERS=$v
-f "scsi|cdrom" ; CD_DRIVERS=$v
-f "pcmcia|network" ; PCMCIA_DRIVERS=$v
+f "scsi disk" ; SCSI_DRIVERS=$v
+f "net network" ; NETWORK_DRIVERS=$v
+f "scsi cdrom" ; CD_DRIVERS=$v
+f "pcmcia network" ; PCMCIA_DRIVERS=$v
[ $ARCH == "i386" ] && FSMODULES="vfat.o fat.o"