Changeset 2541 in MondoRescue for devel

Timestamp:

Jan 9, 2010, 4:40:56 PM (14 years ago)

Author:

Bruno Cornec

Message:

r3577@localhost: bruno | 2010-01-08 02:23:52 +0100
The 2 first commands check and analyze begin to work

Location:

devel/mr

Files:

• etc/mondorescue.conf (modified) (1 diff)
• lib/MondoRescue/Base.pm (modified) (1 diff)
• lib/MondoRescue/LVM.pm (modified) (5 diffs)
• sbin/mranalyze-lvm (modified) (2 diffs)
• sbin/mrcheck-lvm (modified) (4 diffs)

devel/mr/etc/mondorescue.conf

@@ -24 +24 @@
 # Is it LSB ?
 #
-mr_lvmdiskscan default = /usr/sbin/lvmdiskscan
+mr_lvmdiskscan default = /sbin/lvmdiskscan
 mr_lvmprocfile default = /proc/lvm/global
-mr_lvmcmd default = /usr/sbin/lvm   
-mr_lvmpath default = /usr/sbin/
+mr_lvmcmd default = /sbin/lvm
+mr_lvmpath default = /sbin/

devel/mr/lib/MondoRescue/Base.pm

@@ -63 +63 @@
 my ($confdir,$localdir,$pbproj) = mr_dynconf_init();
 
+# Temp dir
+pb_temp_init();
+
 # First use the main configuration file
 pb_conf_init($pbproj);

devel/mr/lib/MondoRescue/LVM.pm

@@ -16 +16 @@
 use ProjectBuilder::Base;
 use ProjectBuilder::Conf;
+use MondoRescue::Base;
 
 # Inherit from the "Exporter" module which handles exporting functions.
@@ -58 +59 @@
 my $lvmpath = $lvmpath_t->{$ENV{PBPROJ}};
 
+# That file is not mandatory anymore
 if (! -x $lvmproc) {
-    pb_log(1,"$lvmproc doesn't exist.");
-    return(0,undef);
-    }
-
-# Check LVM volumes presence
-open(LVM,$lvmproc) || mr_exit(-1,"Unable to open $lvmproc");
-while (<LVM>) {
-    if (/0 VGs 0 PVs 0 LVs/) {
-        pb_log(1,"No LVM volumes found in $lvmproc");
-        return(0,undef);
-    }
-}
-close(LVM);
+    pb_log(1,"$lvmproc doesn't exist\n");
+} else {
+    # Check LVM volumes presence
+    pb_log(2,"Checking with $lvmproc\n");
+    open(LVM,$lvmproc) || mr_exit(-1,"Unable to open $lvmproc");
+    while (<LVM>) {
+        if (/0 VGs 0 PVs 0 LVs/) {
+            pb_log(1,"No LVM volumes found in $lvmproc\n");
+            return(0,undef);
+        }
+    }
+    close(LVM);
+}
 
 # Check LVM version
-my $lvmver=0;
-if (-x $lvmds ) {
+my $lvmver = 0;
+if (-x $lvmds) {
+    pb_log(2,"Checking with $lvmds\n");
     open(LVM,"$lvmds --help 2>&1 |") || mr_exit(-1,"Unable to execute $lvmds");
     while (<LVM>) {
         if (/Logical Volume Manager/ || /LVM version:/) {
                 $lvmver = $_;
+                chomp($lvmver);
                 $lvmver =~ s/:([0-9])\..*/$1/;
         }
     }
-}
-close(LVM);
+    close(LVM);
+    pb_log(2,"Found a LVM version of $lvmver with $lvmds --help\n");
+}
 
 if ($lvmver == 0) {
-    # Still not found
+    pb_log(2,"LVM version value is still not known\n");
     if (-x $lvmcmd) {
+        pb_log(2,"Checking with $lvmcmd\n");
         open(LVM,"$lvmcmd version |") || mr_exit(-1,"Unable to execute $lvmcmd");
         while (<LVM>) {
             if (/LVM version/) {
                 $lvmver = $_;
-                $lvmver =~ s/LVM version ([0-9])\..*/$1/;
+                chomp($lvmver);
+                $lvmver =~ s/:([0-9])\..*/$1/;
+                $lvmver =~ s/[\s]*LVM version[:]*[\s]+([0-9])\..*/$1/;
             }
         }
         close(LVM);
+        pb_log(2,"Found a LVM version of $lvmver with $lvmcmd version\n");
     }
 }
@@ -102 +111 @@
 if ($lvmver == 0) {
     # Still not found
-    mr_exit(-1,"Unable to determine LVM version.\nPlease report to the dev team with the result of the commands\n$lvmds and $lvmcmd");
+    mr_exit(-1,"Unable to determine LVM version.\nPlease report to the dev team with the result of the commands:\n$lvmds --help and $lvmcmd version\n");
 } elsif ($lvmver == 1) {
     $lvmcmd = "$lvmpath";
@@ -108 +117 @@
     $lvmcmd .= " ";
 } else {
-    pb_log(0,"Unknown LVM version $lvmver");
+    pb_log(0,"Unknown LVM version $lvmver\n");
 }
 # Here $lvmcmd contains a full path name
-pb_log(1,"Found LVM version $lvmver");
+pb_log(1,"Found LVM version $lvmver\n");
 return ($lvmver,$lvmcmd);
 
@@ -203 +212 @@
         print $OUTPUT "\n";
     } elsif (/^LV:/) {
-        if ($firsttime eq 0) {
+        if ($firsttime == 0) {
             print $OUTPUT "\n";
             print $OUTPUT "# Activate All Volume Groups\n";

devel/mr/sbin/mranalyze-lvm

@@ -128 +128 @@
 my $MINDI_LIB = "PBLIB";
 my $MINDI_SBIN = "$MINDI_PREFIX/sbin";
-# 
-# Temp dir
-#
-pb_temp_init();
 
-# MondoRescue init
+# Init
 mr_init();
 
@@ -151 +147 @@
     pb_log(1,"LVM v$lvmver Structure Analyzed") 
 }
-close($OUTPUT);
+if (defined $opts{'o'}) {
+    close($OUTPUT);
+}
 mr_exit(0,undef);

devel/mr/sbin/mrcheck-lvm

@@ -25 +25 @@
 =head1 NAME
 
-mranalyze-lvm - A Mindi Tool to analyze the LVM configuration and store it
+mrcheck-lvm - A Mindi Tool to check the LVM basic info
 
 =head1 DESCRIPTION
 
-B<mranalyze-lvm> prints all the information related to the LVM configuration that may be used by a restoration process
+B<mrcheck-lvm> prints all the information related to the LVM configuration that may be used by a restoration process
 
 =head1 SYNOPSIS
 
-mranalyze-lvm [-v]|[-q]|[-h]|[--man][-o outputfile][-l logfile]
+mrcheck-lvm [-v]|[-q]|[-h]|[--man][-o outputfile][-l logfile]
 
 =head1 OPTIONS
@@ -93 +93 @@
 # Initialize the syntax string
 
-pb_syntax_init("mranalyze-lvm Version PBVER-rPBREV\n");
+pb_syntax_init("mrcheck-lvm Version PBVER-rPBREV\n");
 
 # Handle options
@@ -128 +128 @@
 my $MINDI_LIB = "PBLIB";
 my $MINDI_SBIN = "$MINDI_PREFIX/sbin";
-# 
-# Temp dir
-#
-pb_temp_init();
+
+# Init
+mr_init();
 
 # -------------------------------- main -----------------------------------
@@ -141 +140 @@
 }
 
-my $lvmver = mr_lvm_analyze($OUTPUT);
+my ($lvmver,$lvmcmd) = mr_lvm_check($OUTPUT);
+if (defined $opts{'o'}) {
+    close($OUTPUT);
+}
 
 if ($lvmver == 0) {
-    pb_log(1,"No LVM handling") 
+    pb_log(0,"No LVM handling\n") 
 } else {
-    pb_log(1,"LVM v$lvmver Structure Analyzed") 
+    pb_log(0,"LVM v$lvmver command is $lvmcmd\n") 
 }
-close($OUTPUT);
 mr_exit(0,undef);