Changeset 3016 in MondoRescue

Timestamp:

Jun 3, 2012, 1:52:28 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Substitue a complex awk expression by a more simpler perl one in analyze-my-lvm
• Fix a bug on RHEL 5 where lvdisplay doesn't support redirection. Adds a | cat in between, as was done for vgdisplay

Location:

branches/3.0

Files:

• mindi/analyze-my-lvm (modified) (4 diffs)
• mondo/test/mondo-test (modified) (1 diff)

branches/3.0/mindi/analyze-my-lvm

@@ -13 +13 @@
 GetValueFromField() {
     local res
-    sed s/'    '/~/ "$1" | tr -s ' ' ' ' | sed s/'~ '/'~'/ | grep -i "$2~" | cut -d'~' -f2,3,4,5 | tr '~' ' ' | gawk '{ if ($2=="MB") {printf "%dm",$1;} else if ($2=="MiB") {printf "%dm",$1;} else if ($2=="KB") {printf "%dk",$1;} else if ($2=="KiB") {printf "%dk",$1;} else if ($2=="GB") {printf "%fg",$1;} else if ($2=="GiB") {printf "%fg",$1;} else if ($2=="TB") {printf "%dt",$1;} else if ($2=="TiB") {printf "%dt",$1;} else {print $0;};}'
+    grep -i "$2" "$1" | perl -pi -e 's/\s*(.*)\s\s\s+(.+)$/$2/;s/\sT[i]*B/t/;s/\sG[i]*B/g/;s/\sM[i]*B/m/;s/\sK[i]*B/k/'
 }
 
@@ -84 +84 @@
     device=$1
     output=""
-    $LVMCMD lvdisplay $device > $fname
+    $LVMCMD lvdisplay $device | cat > $fname
     stripes=`GetValueFromField $fname "Stripes"`
     stripesize=`GetValueFromField $fname "Stripe size (MByte)"`m
@@ -90 +90 @@
     [ "$stripesize" = "k" ] && stripesize=""
     allocation=`GetValueFromField $fname "LV Size"`
-    [ ! "`echo "$allocation" | grep "[k,m,g]"`" ] && allocation="$allocation"m
+    [ ! "`echo "$allocation" | grep "[k,m,g,t]"`" ] && allocation="$allocation"m
     if echo "$allocation" | grep -E '^.*g$' > /dev/null 2> /dev/null ; then
         val=`echo "$allocation" | sed s/g//`
@@ -124 +124 @@
     rm -f $VG_info_file
 }
-
-
 
 

branches/3.0/mondo/test/mondo-test

@@ -257 +257 @@
     sudomrtest "scp -i $MRTEST/.ssh/pb_dsa -P $port /tmp/script root@localhost:"
     sudomrtest "ssh -i $MRTEST/.ssh/pb_dsa -p $port root@localhost ./script"
-    sudomrtest "qemu-img create -f qcow2 $MRTEST/vm/$d.rest 8"
+    sudomrtest "qemu-img create -f qcow2 $MRTEST/vm/$d.rest 8G"
     sudomrtest "chmod 666 $MRTEST/vm/$d.rest"
     #sudomrtest "ssh -i $MRTEST/.ssh/pb_dsa -p $port root@localhost /sbin/halt -p" &