diff options
| author | Thomas Backlund <tmb@mageia.org> | 2016-03-29 23:06:38 +0300 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2016-09-25 12:00:59 +0300 |
| commit | 21b32704e6db5726e8654de0897ba304f8335ddf (patch) | |
| tree | cf92f7dc5192aac2ca320f069b5beefff6ea471e | |
| parent | 4dab94f07ad09540cf41c9f7d511091709cf1a7f (diff) | |
| download | drakx-21b32704e6db5726e8654de0897ba304f8335ddf.tar drakx-21b32704e6db5726e8654de0897ba304f8335ddf.tar.gz drakx-21b32704e6db5726e8654de0897ba304f8335ddf.tar.bz2 drakx-21b32704e6db5726e8654de0897ba304f8335ddf.tar.xz drakx-21b32704e6db5726e8654de0897ba304f8335ddf.zip | |
fix detecting nvme devices as block devices
(cherry picked from commit 3da2f2c8125861ca76436049b4706f9fcd17b446)
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/detect_devices.pm | 4 |
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() |