Changeset 2542 in MondoRescue for devel

Timestamp:

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

Author:

Bruno Cornec

Message:

r3578@localhost: bruno | 2010-01-08 15:12:12 +0100
Begin modifications top replace the *display commands by the *s command in LVM

File:

• devel/mr/lib/MondoRescue/LVM.pm (modified) (3 diffs)

devel/mr/lib/MondoRescue/LVM.pm

@@ -137 +137 @@
 
 my $OUTPUT = shift;
+my $lvm;
 
 my ($lvmver,$lvmcmd) = mr_lvm_check();
 return(0) if ($lvmver == 0);
 
-print $OUTPUT "LVM:$lvmver";
+print $OUTPUT "LVM:$lvmver\n";
 
 # Analyze the existing physical volumes
-open(LVM,$lvmcmd."pvdisplay -c |") || mr_exit(-1,"Unable to execute ".$lvmcmd."pvdisplay -c");
+#open(LVM,$lvmcmd."pvdisplay -c |") || mr_exit(-1,"Unable to execute ".$lvmcmd."pvdisplay -c");
+open(LVM,$lvmcmd."pvs --noheadings --nosuffix --units m --separator : |") || mr_exit(-1,"Unable to execute ".$lvmcmd."pvs");
 while (<LVM>) {
+        s/^[\s]*//;
+        my ($pv,$vg,$foo,$foo2,$size,$foo3) = split(/:/);
+        $lvm->{$vg}->{'pv'}[$lvm->{$vg}->{'pvnum'}] = $pv;
+        $lvm->{$vg}->{'pvnum'}++;
+        $lvm->{$vg}->{$pv}->{'size'} = $size;
         print $OUTPUT "PV:$_";
 }
@@ -151 +158 @@
 
 # Analyze the existing volume groups
-open(LVM,$lvmcmd."vgdisplay -c |") || mr_exit(-1,"Unable to execute ".$lvmcmd."vgdisplay -c");
+#open(LVM,$lvmcmd."vgdisplay -c |") || mr_exit(-1,"Unable to execute ".$lvmcmd."vgdisplay -c");
+open(LVM,$lvmcmd."vgs --noheadings --nosuffix --units m --separator : |") || mr_exit(-1,"Unable to execute ".$lvmcmd."vgs");
 while (<LVM>) {
+        s/^[\s]*//;
         print $OUTPUT "VG:$_";
 }
@@ -158 +167 @@
 
 # Analyze the existing logical volumes
-open(LVM,$lvmcmd."lvdisplay -c |") || mr_exit(-1,"Unable to execute ".$lvmcmd."lvdisplay -c");
+#open(LVM,$lvmcmd."lvdisplay -c |") || mr_exit(-1,"Unable to execute ".$lvmcmd."lvdisplay -c");
+open(LVM,$lvmcmd."lvs --noheadings --nosuffix --units m --separator : |") || mr_exit(-1,"Unable to execute ".$lvmcmd."lvs");
 while (<LVM>) {
+        s/^[\s]*//;
         print $OUTPUT "LV:$_";
 }
 close(LVM);
-return($lvmver);
+return($lvm);
 }