summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-09-14 14:23:14 +0000
committerOlivier Blin <oblin@mandriva.com>2009-09-14 14:23:14 +0000
commit4062da0581a429546f68ee1d560d1862827f3d11 (patch)
tree3fbfad6f1cebf69744191c14adb944b5f966c719
parentd24ab47eb042fec9c6e90e676c4c414862e1baea (diff)
downloaddrakx-backup-do-not-use-4062da0581a429546f68ee1d560d1862827f3d11.tar
drakx-backup-do-not-use-4062da0581a429546f68ee1d560d1862827f3d11.tar.gz
drakx-backup-do-not-use-4062da0581a429546f68ee1d560d1862827f3d11.tar.bz2
drakx-backup-do-not-use-4062da0581a429546f68ee1d560d1862827f3d11.tar.xz
drakx-backup-do-not-use-4062da0581a429546f68ee1d560d1862827f3d11.zip
ide-disk module is now named ide-gd_mod (backport from trunk)
-rw-r--r--kernel/list_modules.pm2
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/modules.pm2
3 files changed, 3 insertions, 2 deletions
diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm
index 8e321643d..b854f2cdc 100644
--- a/kernel/list_modules.pm
+++ b/kernel/list_modules.pm
@@ -135,7 +135,7 @@ our %l = (
),
],
pcmcia => [ qw(aha152x_cs fdomain_cs nsp_cs qlogic_cs ide-cs pata_pcmcia sym53c500_cs) ],
- raw => [ qw(ide-disk sd_mod virtio_blk) ],
+ raw => [ qw(ide-gd_mod sd_mod virtio_blk) ],
usb => [ qw(usb-storage) ],
firewire => [ qw(sbp2) ],
cdrom => [ qw(ide-cd_mod sr_mod) ],
diff --git a/perl-install/NEWS b/perl-install/NEWS
index cf5ab6ba9..e893c2efb 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -4,6 +4,7 @@
o sound: snd_ctxfi
- fix parsing dmidecode output (broken since we use dmidecode-2.10,
aka since November 24 2008)
+- ide-disk module is now named ide-gd_mod
Version 12.32 - 23 April 2009
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index af6a10aa3..7b40ab43e 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -257,7 +257,7 @@ sub when_load_category {
if ($category =~ m,disk/ide,) {
$conf->add_probeall('ide-controller', $name);
- eval { load('ide_disk') };
+ eval { load('ide_gd_mod') };
} elsif ($category =~ m,disk/(scsi|hardware_raid|sata|firewire),) {
$conf->add_probeall('scsi_hostadapter', $name);
eval { load('sd_mod') };