summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2016-03-29 23:06:38 +0300
committerThomas Backlund <tmb@mageia.org>2016-03-29 23:06:38 +0300
commit3da2f2c8125861ca76436049b4706f9fcd17b446 (patch)
treeb8f71fb3db94ce9010994f469803360877fb3c65
parent1dd61099cf8a0e5e8cb7a671b3ac4853860a47b1 (diff)
downloaddrakx-3da2f2c8125861ca76436049b4706f9fcd17b446.tar
drakx-3da2f2c8125861ca76436049b4706f9fcd17b446.tar.gz
drakx-3da2f2c8125861ca76436049b4706f9fcd17b446.tar.bz2
drakx-3da2f2c8125861ca76436049b4706f9fcd17b446.tar.xz
drakx-3da2f2c8125861ca76436049b4706f9fcd17b446.zip
fix detecting nvme devices as block devices
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/detect_devices.pm4
-rw-r--r--perl-install/install/NEWS2
3 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 40cc2e8cd..f3a76753f 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- fix detecting nvme devices as block devices
+
Version 17.24 - 23 March 2016
- use systemd-detect-virt for detecting virtualization technology
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 09911714e..e38a1b969 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -474,11 +474,11 @@ sub getMmcBlk() {
}
sub getNVMe() {
- -d '/sys/bus/pci_express/devices' or return;
+ -d '/sys/class/nvme' or return;
map {
{ device => basename($_), info => "NVMe block device", media_type => 'hd', bus => 'pci_express' };
}
- glob("/sys/bus/pci_express/devices/*/block/*");
+ glob("/sys/block/nvme*");
}
=item getCPUs()
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index a5e8baa12..1dc002e26 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- fix detecting nvme devices as block devices
+
Version 17.24 - 23 March 2016
- fix build on ia32