summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2010-05-11 16:42:46 +0000
committerPascal Terjan <pterjan@mandriva.org>2010-05-11 16:42:46 +0000
commit91dfc62419aed4dd200ad4531b049eea3bf0c454 (patch)
treea168d7ed2de8242e525ad7ec27412518d4f44b99
parent1c069f64db8728fa0302acbe9f4827e0814adc3c (diff)
downloaddrakx-91dfc62419aed4dd200ad4531b049eea3bf0c454.tar
drakx-91dfc62419aed4dd200ad4531b049eea3bf0c454.tar.gz
drakx-91dfc62419aed4dd200ad4531b049eea3bf0c454.tar.bz2
drakx-91dfc62419aed4dd200ad4531b049eea3bf0c454.tar.xz
drakx-91dfc62419aed4dd200ad4531b049eea3bf0c454.zip
workaround mapper/* being symlinks in dmraid support
-rw-r--r--perl-install/Makefile.config2
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/fs/wild_device.pm2
3 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config
index 7e07a7086..f8976ea1c 100644
--- a/perl-install/Makefile.config
+++ b/perl-install/Makefile.config
@@ -1,5 +1,5 @@
# -*- Makefile -*-
-VERSION:=13.24
+VERSION:=13.25
SUDO = sudo
TMPDIR = /tmp
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 5a3109fdf..2709b9df0 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,8 +1,11 @@
+Version 13.25 - 11 May 2010
+
- bugfix for draklive-install: use "short" locale name when matching
locales-* packages to detect unused locales (fixes bug #44270)
- diskdrake:
o don't ask to reboot after resize if not needed
o do not ask to reboot after resizing LUKS if not mounted
+- workaround mapper/* being symlinks in dmraid support
Version 13.24 - 9 May 2010
diff --git a/perl-install/fs/wild_device.pm b/perl-install/fs/wild_device.pm
index afc59b4ee..37818ce5a 100644
--- a/perl-install/fs/wild_device.pm
+++ b/perl-install/fs/wild_device.pm
@@ -44,7 +44,7 @@ sub to_subpart {
($part{major}, $part{minor}) = unmakedev($rdev);
}
- my $symlink = readlink("$::prefix$dev");
+ my $symlink = readlink("$::prefix$dev") unless $dev =~ m!mapper/!;
$dev =~ s!/u?dev/!!;
if ($symlink && $symlink !~ m!^/!) {