summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/detect_devices.pm4
2 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index ef5241e98..f83d1055a 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,4 @@
+- fix detecting nvme devices as block devices
- detect nvme devices as block devices (mga#17743)
- detect partitions on nvme devices (mga#17743)
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 45ccdd248..2acbbca67 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()