summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2015-04-12 21:42:14 +0259
committerThomas Backlund <tmb@mageia.org>2015-04-12 21:42:14 +0259
commit9646e464b11c624c87ab939ad6aa14e9bd733f68 (patch)
tree1ecec1b9933668a63eda2ee35b2250ded76d999a
parente4bc6f878de1190896fd7852214430871645e5e6 (diff)
downloaddrakx-9646e464b11c624c87ab939ad6aa14e9bd733f68.tar
drakx-9646e464b11c624c87ab939ad6aa14e9bd733f68.tar.gz
drakx-9646e464b11c624c87ab939ad6aa14e9bd733f68.tar.bz2
drakx-9646e464b11c624c87ab939ad6aa14e9bd733f68.tar.xz
drakx-9646e464b11c624c87ab939ad6aa14e9bd733f68.zip
- dont force 'p' for dmraid partitions, it's conditional depending
on device naming like dmraid, kpartx and kernel handles it
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/devices.pm2
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index bac6b887e..ff077fda1 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- dont force 'p' for dmraid partitions, it's conditional depending
+ on device naming like dmraid, kpartx and kernel handles it
+
Version 16.80 - 9 April 2015
- diskdrake:
diff --git a/perl-install/devices.pm b/perl-install/devices.pm
index 1dede1cc1..ce3a159a3 100644
--- a/perl-install/devices.pm
+++ b/perl-install/devices.pm
@@ -170,7 +170,7 @@ sub part_prefix {
sub prefix_for_dev {
my ($dev) = @_;
- $dev . ($dev =~ /\d$/ || $dev =~ m!mapper/! ? 'p' : '');
+ $dev . ($dev =~ /\d$/ 'p' : '');
}
sub should_prefer_UUID {