summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2016-03-23 17:53:00 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-03-23 20:20:43 +0100
commit6ca54770c96bd744892891e7476ea01b64f61796 (patch)
treeeb900803ed1593af42b68db93c401aaea8d73124
parent33564bc9c898189e9770ba2e69498ca2a1d60aaf (diff)
downloaddrakx-6ca54770c96bd744892891e7476ea01b64f61796.tar
drakx-6ca54770c96bd744892891e7476ea01b64f61796.tar.gz
drakx-6ca54770c96bd744892891e7476ea01b64f61796.tar.bz2
drakx-6ca54770c96bd744892891e7476ea01b64f61796.tar.xz
drakx-6ca54770c96bd744892891e7476ea01b64f61796.zip
simplify: use virt_technology()
-rw-r--r--perl-install/detect_devices.pm7
-rw-r--r--perl-install/install/NEWS1
2 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 48eb3e68f..d93333016 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -1478,8 +1478,7 @@ Are we running under Hyper-V hypervisor?
=cut
sub isHyperv() {
- dmidecode_category('System')->{Manufacturer} =~ /Microsoft Corporation/i
- && dmidecode_category('System')->{'Product Name'} =~ /Virtual Machine/i;
+ virt_technology() eq 'microsoft';
}
=item is_virtualbox()
@@ -1489,7 +1488,7 @@ Are we running under VirtualBox hypervisor?
=cut
sub is_virtualbox() {
- any { $_->{driver} eq 'vboxadd' } detect_devices::pci_probe();
+ virt_technology() eq 'oracle';
}
=item is_vmware()
@@ -1499,7 +1498,7 @@ Are we running under VMware hypervisor?
=cut
sub is_vmware() {
- any { $_->{driver} =~ /Card:VMware/ } detect_devices::pci_probe();
+ virt_technology() eq 'vmware';
}
=item is_netbook_nettop()
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 2fe73efb8..c62919fe3 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,5 @@
- fix build on ia32
+- use systemd-detect-virt for detecting virtualization technology
Version 17.23 - 22 March 2016