summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/modules.pm4
2 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 59e8c8368..76628a23b 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,4 @@
+- do not crash loading stage2 in Virtual PC (mga#14117)
- bootloader config:
o do not crash if fstab contains a bind mount on a file (mga#14657)
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 5a122a11c..775a67447 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -270,8 +270,8 @@ sub when_load_category {
$conf->add_probeall('scsi_hostadapter', $name);
if (detect_devices::isHyperv()) {
log::l("HyperV detected. Loading storvsc");
- load('hv_vmbus');
- load('hv_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') {