summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2016-02-14 01:28:37 +0200
committerThomas Backlund <tmb@mageia.org>2016-09-25 11:51:16 +0300
commita957610d01a094e040bb2bf0ce893be24ec9e449 (patch)
tree072a5fc386793f667bb6a3f075cfd5771649e5c1
parent4762bfc751b1b994cb129a80f7eb3424c503a4ea (diff)
downloaddrakx-a957610d01a094e040bb2bf0ce893be24ec9e449.tar
drakx-a957610d01a094e040bb2bf0ce893be24ec9e449.tar.gz
drakx-a957610d01a094e040bb2bf0ce893be24ec9e449.tar.bz2
drakx-a957610d01a094e040bb2bf0ce893be24ec9e449.tar.xz
drakx-a957610d01a094e040bb2bf0ce893be24ec9e449.zip
detect partitions on nvme devices (mga#17743)
(cherry picked from commit 4eb296a89c540a3ebdcecbc3f55758c4b5e5b97c)
-rw-r--r--perl-install/NEWS5
-rw-r--r--perl-install/devices.pm2
2 files changed, 3 insertions, 4 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 01cd02139..9827ec575 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,5 @@
-- davfs
- o suppress a trailing space in writing secrets (mga#10540)
-
+- detect partitions on nvme devices (mga#17743)
+
Version 16.104 - 13 June 2015
- diskdrake:
diff --git a/perl-install/devices.pm b/perl-install/devices.pm
index aa65204ed..5b3e4e8ba 100644
--- a/perl-install/devices.pm
+++ b/perl-install/devices.pm
@@ -157,7 +157,7 @@ sub make($) {
sub simple_partition_scan {
my ($part) = @_;
- $part->{device} =~ /((?:[hsv]|xv)d[a-z]|mmcblk\d+p)(\d+)$/;
+ $part->{device} =~ /((?:[hsv]|xv)d[a-z]|mmcblk|nvme\d+p)(\d+)$/;
}
sub part_number {
my ($part) = @_;