From 3da2f2c8125861ca76436049b4706f9fcd17b446 Mon Sep 17 00:00:00 2001 From: Thomas Backlund Date: Tue, 29 Mar 2016 23:06:38 +0300 Subject: fix detecting nvme devices as block devices --- perl-install/NEWS | 2 ++ perl-install/detect_devices.pm | 4 ++-- perl-install/install/NEWS | 2 ++ 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 -- cgit v1.2.1