[pve-devel] r5596 - vzdump/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-02-23 12:20:24 +0100 (Wed, 23 Feb 2011)
New Revision: 5596

Modified:
   vzdump/trunk/ChangeLog
   vzdump/trunk/Makefile
   vzdump/trunk/VZDump.pm
   vzdump/trunk/changelog.Debian
Log:


Modified: vzdump/trunk/ChangeLog
===================================================================
--- vzdump/trunk/ChangeLog	2011-02-23 11:08:30 UTC (rev 5595)
+++ vzdump/trunk/ChangeLog	2011-02-23 11:20:24 UTC (rev 5596)
@@ -1,3 +1,8 @@
+2011-02-23  Proxmox Support Team  <support at proxmox.com>
+
+	* VZDump.pm (get_lvm_mapping): accept lowercase unit (M and
+	m). Some systems seems to use lowercase letters.
+
 2010-12-06  Proxmox Support Team  <support at proxmox.com>
 
 	* vzrestore (restore_openvz): allow restore from STDIN ('-')

Modified: vzdump/trunk/Makefile
===================================================================
--- vzdump/trunk/Makefile	2011-02-23 11:08:30 UTC (rev 5595)
+++ vzdump/trunk/Makefile	2011-02-23 11:20:24 UTC (rev 5596)
@@ -13,7 +13,7 @@
 
 VERSION=1.2
 PACKAGE=vzdump
-PKGREL=10
+PKGREL=11
 
 #ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 #RPMARCH:=$(shell rpm --eval %_build_arch)

Modified: vzdump/trunk/VZDump.pm
===================================================================
--- vzdump/trunk/VZDump.pm	2011-02-23 11:08:30 UTC (rev 5595)
+++ vzdump/trunk/VZDump.pm	2011-02-23 11:20:24 UTC (rev 5596)
@@ -641,7 +641,7 @@
     my $cmd = "lvs --units m --separator ':' --noheadings -o vg_name,lv_name,lv_size";
     if (my $fd = IO::File->new ("$cmd 2>/dev/null|")) {
 	while (my $line = <$fd>) {
-	    if ($line =~ m|^\s*(\S+):(\S+):(\d+(\.\d+))M$|) {
+	    if ($line =~ m|^\s*(\S+):(\S+):(\d+(\.\d+))[Mm]$|) {
 		my $vg = $1;
 		my $lv = $2;
 		$devmapper->{"/dev/$vg/$lv"} = [$vg, $lv];

Modified: vzdump/trunk/changelog.Debian
===================================================================
--- vzdump/trunk/changelog.Debian	2011-02-23 11:08:30 UTC (rev 5595)
+++ vzdump/trunk/changelog.Debian	2011-02-23 11:20:24 UTC (rev 5596)
@@ -1,3 +1,9 @@
+vzdump (1.2-11) unstable; urgency=low
+
+  * fix lvm volume scan (allow lowercase unit 'm')
+
+ -- Proxmox Support Team <support at proxmox.com>  Wed, 23 Feb 2011 12:19:19 +0100
+
 vzdump (1.2-10) unstable; urgency=low
 
   * new --stdout option (as suggested by Mario Wolff)