diff options
author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2014-12-05 23:10:57 +0100 |
---|---|---|
committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2014-12-05 23:11:49 +0100 |
commit | cf937b5a274d1c3db2baa63476a60c9df9415ce1 (patch) | |
tree | edde227ac75e752dc96400201f72d622816cc700 | |
parent | 3bf5da0e1b456263d5bdfde4adb8f0156149792b (diff) | |
download | drakx-cf937b5a274d1c3db2baa63476a60c9df9415ce1.tar drakx-cf937b5a274d1c3db2baa63476a60c9df9415ce1.tar.gz drakx-cf937b5a274d1c3db2baa63476a60c9df9415ce1.tar.bz2 drakx-cf937b5a274d1c3db2baa63476a60c9df9415ce1.tar.xz drakx-cf937b5a274d1c3db2baa63476a60c9df9415ce1.zip |
gnore modules failures for hyper-v (mga#14117)
BTW why was this added here? this won't work in stage1...
see commit 93cca46c26c2078593f663f894193053cc740d43
-rw-r--r-- | perl-install/install/NEWS | 1 | ||||
-rw-r--r-- | perl-install/modules.pm | 4 |
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') { |