summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-03-05 18:37:04 +0000
committerThierry Vignaud <tv@mageia.org>2013-03-05 18:37:04 +0000
commitf9d52c5dd5f6191d3e4956ee040d0815f651cd1c (patch)
treefef399ab34fca959ffc455d634d9455966886bff
parentd74b382be74ecebdaa914b146e7b893d36d62d56 (diff)
downloaddrakx-f9d52c5dd5f6191d3e4956ee040d0815f651cd1c.tar
drakx-f9d52c5dd5f6191d3e4956ee040d0815f651cd1c.tar.gz
drakx-f9d52c5dd5f6191d3e4956ee040d0815f651cd1c.tar.bz2
drakx-f9d52c5dd5f6191d3e4956ee040d0815f651cd1c.tar.xz
drakx-f9d52c5dd5f6191d3e4956ee040d0815f651cd1c.zip
kill everything regarding legacy ide-scsi (removed on january 2009, in 2.6.29)
-rw-r--r--kernel/list_modules.pm2
-rw-r--r--perl-install/any.pm6
-rw-r--r--perl-install/detect_devices.pm1
3 files changed, 1 insertions, 8 deletions
diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm
index 6e5ad2a7a..69a978f2e 100644
--- a/kernel/list_modules.pm
+++ b/kernel/list_modules.pm
@@ -316,7 +316,7 @@ our %l = (
qw(8250_pci 8250 epca esp isicom istallion jsm moxa mxser mxser_new stallion sx synclink synclinkmp),
],
other => [
- qw(defxx ide-floppy ide-scsi ide-tape loop lp nbd sg st),
+ qw(defxx ide-floppy ide-tape loop lp nbd sg st),
qw(parport_pc parport_serial),
qw(btaudio mmc_block),
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 6fc75dc15..22a79e9fb 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -144,12 +144,6 @@ sub setupBootloaderBefore {
$bootloader->{message_text} = delete $bootloader->{message};
}
- #- remove previous ide-scsi lines
- bootloader::modify_append($bootloader, sub {
- my ($_simple, $dict) = @_;
- @$dict = grep { $_->[1] ne 'ide-scsi' } @$dict;
- });
-
if (cat_("/proc/cmdline") =~ /mem=nopentium/) {
bootloader::set_append_with_key($bootloader, mem => 'nopentium');
}
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 6d4090d5f..54d0f7bec 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -312,7 +312,6 @@ sub getIDE() {
#- Great. 2.2 kernel, things are much easier and less error prone.
foreach my $d (sort @{[glob_('/proc/ide/hd*')]}) {
- cat_("$d/driver") =~ /ide-scsi/ and next; #- already appears in /proc/scsi/scsi
my $t = chomp_(cat_("$d/media"));
my $type = ${{ disk => 'hd', cdrom => 'cdrom', tape => 'tape', floppy => 'fd' }}{$t} or next;
my $info = chomp_(cat_("$d/model")) || "(none)";