summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2009-08-14 20:16:42 +0000
committerPascal Terjan <pterjan@mandriva.org>2009-08-14 20:16:42 +0000
commit39882af875a8970e789189de4c93e308a0b751fc (patch)
tree7580864c172402670d4651aec207f698029a7ee8
parent5b85bc9a48586804b22ff86e34f36e0b202d0c6e (diff)
downloaddrakx-39882af875a8970e789189de4c93e308a0b751fc.tar
drakx-39882af875a8970e789189de4c93e308a0b751fc.tar.gz
drakx-39882af875a8970e789189de4c93e308a0b751fc.tar.bz2
drakx-39882af875a8970e789189de4c93e308a0b751fc.tar.xz
drakx-39882af875a8970e789189de4c93e308a0b751fc.zip
set virtio/xen block modules in a section actually used
-rw-r--r--kernel/list_modules.pm3
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/steps_interactive.pm4
3 files changed, 6 insertions, 3 deletions
diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm
index a45183697..5ff997b1f 100644
--- a/kernel/list_modules.pm
+++ b/kernel/list_modules.pm
@@ -134,8 +134,9 @@ our %l = (
qw(ips ppa imm),
),
],
+ virtual => [ qw(xenblk virtio_blk) ],
pcmcia => [ qw(aha152x_cs fdomain_cs nsp_cs qlogic_cs ide-cs pata_pcmcia sym53c500_cs) ],
- raw => [ qw(ide-gd_mod sd_mod virtio_blk) ],
+ raw => [ qw(ide-gd_mod sd_mod) ],
usb => [ qw(usb-storage) ],
firewire => [ qw(sbp2) ],
cdrom => [ qw(ide-cd_mod sr_mod) ],
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 691a2d309..7ad9f437c 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- set virtio/xen block modules in a section actually offered
+
Version 12.44 - 13 August 2009
- fix parsing dmidecode output (broken since we use dmidecode-2.10,
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index 2719c2b48..acdbb57d6 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -254,8 +254,8 @@ sub setupSCSI {
modules::interactive::load_category($o, $o->{modules_conf}, 'bus/firewire', 1);
my $have_non_scsi = detect_devices::hds(); #- at_least_one scsi device if we have no disks
- modules::interactive::load_category($o, $o->{modules_conf}, 'disk/card_reader|ide|scsi|hardware_raid|sata|firewire', 1, !$have_non_scsi);
- modules::interactive::load_category($o, $o->{modules_conf}, 'disk/card_reader|ide|scsi|hardware_raid|sata|firewire') if !detect_devices::hds(); #- we really want a disk!
+ modules::interactive::load_category($o, $o->{modules_conf}, 'disk/card_reader|ide|scsi|hardware_raid|sata|firewire|virtual', 1, !$have_non_scsi);
+ modules::interactive::load_category($o, $o->{modules_conf}, 'disk/card_reader|ide|scsi|hardware_raid|sata|firewire|virtual') if !detect_devices::hds(); #- we really want a disk!
install::interactive::tellAboutProprietaryModules($o);