Changeset 3108 in MondoRescue for devel/mr

Timestamp:

May 5, 2013, 4:24:53 AM (12 years ago)

Author:

Bruno Cornec

Message:

r5244@localhost: bruno | 2013-04-29 00:16:57 +0200

• Minor improvements for devel version of mondorescue

Location:

devel/mr

Files:

• lib/MondoRescue/Base.pm (modified) (3 diffs)
• lib/MondoRescue/LVM.pm (modified) (1 diff)
• sbin/mranalyze-lvm (modified) (1 diff)

devel/mr/lib/MondoRescue/Base.pm

@@ -17 +17 @@
 use POSIX qw(strftime);
 use lib qw (lib);
+use Digest::MD5;
 use ProjectBuilder::Base;
 use ProjectBuilder::Conf;
@@ -80 +81 @@
 open(MD5,"$etcdir/$pbproj.conf.dist.md5") || die "Unable to read mandatory $etcdir/$pbproj.conf.dist.md5: $!";
 my $omd5 = <MD5>;
-chop($omd5);
+chomp($omd5);
 close(MD5);
 open(CONF,"$etcdir/$pbproj.conf.dist") || die "Unable to read mandatory $etcdir/$pbproj.conf.dist: $!";
@@ -86 +87 @@
 binmode(CONF);
 $md5->addfile(CONF);
-die "Invalid MD5 found sum for $etcdir/$pbproj.conf.dist: $md5->hexdigest" if ($omd5 ne $md5->hexdigest);
+my $digest = $md5->hexdigest;
+die "Invalid MD5 sum found for $etcdir/$pbproj.conf.dist: $digest" if ($omd5 ne $digest);
 close(CONF);
 

devel/mr/lib/MondoRescue/LVM.pm

@@ -217 +217 @@
 # Analyze the existing volume groups
 #open(LVM,$lvmcmd."vgdisplay -c |") || mr_exit(-1,"Unable to execute ".$lvmcmd."vgdisplay -c");
-open(LVM,$lvmcmd."vgs --noheadings --nosuffix --units m --separator : | -o vg_all") || mr_exit(-1,"Unable to execute ".$lvmcmd."vgs");
+open(LVM,$lvmcmd."vgs --noheadings --nosuffix --units m --separator : -o vg_all |") || mr_exit(-1,"Unable to execute ".$lvmcmd."vgs");
 while (<LVM>) {
 

devel/mr/sbin/mranalyze-lvm

@@ -6 +6 @@
 # $Id$
 #
-# Copyright B. Cornec 2008
+# Copyright B. Cornec 2008-2012
 # Provided under the GPL v2