summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2014-12-12 19:37:15 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2014-12-12 19:37:15 +0100
commitcc6d1ea0c4ed0f026b82900f1a9385e8d241dbdf (patch)
tree2e09dfe262511101424509fc91e41bd322739888
parent5e66264ae5a6649f4b20d5c9326a5aee405c9f34 (diff)
downloaddrakx-cc6d1ea0c4ed0f026b82900f1a9385e8d241dbdf.tar
drakx-cc6d1ea0c4ed0f026b82900f1a9385e8d241dbdf.tar.gz
drakx-cc6d1ea0c4ed0f026b82900f1a9385e8d241dbdf.tar.bz2
drakx-cc6d1ea0c4ed0f026b82900f1a9385e8d241dbdf.tar.xz
drakx-cc6d1ea0c4ed0f026b82900f1a9385e8d241dbdf.zip
do not load hyper-v modules (mga#14117)
this is already done by udev in stage1 (thanks David Remy for testing)
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/modules.pm5
2 files changed, 2 insertions, 5 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 3e435912c..35b479f3e 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- do not load hyper-v modules (already done by udev in stage1)
+
Version 16.47 - 5 December 2014
- do not crash loading stage2 in Virtual PC (mga#14117)
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 775a67447..6e448a916 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -268,11 +268,6 @@ sub when_load_category {
eval { load('ide_gd_mod') };
} elsif ($category =~ m,disk/(scsi|hardware_raid|sata|firewire|virtual),) {
$conf->add_probeall('scsi_hostadapter', $name);
- if (detect_devices::isHyperv()) {
- log::l("HyperV detected. Loading storvsc");
- # those works on Hyper-V but fails on Virtual PC:
- eval { load($_) } foreach qw(hv_vmbus hv_storvsc);
- }
eval { load('sd_mod') };
} elsif ($category eq 'bus/usb') {
$conf->add_probeall('usb-interface', $name);