Changeset 3147 in MondoRescue for branches/3.1/mindi/analyze-my-lvm

Timestamp:

Jun 19, 2013, 8:34:46 AM (11 years ago)

Author:

Bruno Cornec

Message:

• First pass on svn merge -r 2935:3146 ../3.0

File:

• branches/3.1/mindi/analyze-my-lvm (modified) (11 diffs)

branches/3.1/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/'
 }
 
@@ -54 +54 @@
     # Exclude LVs member of that env var
     if [ "$MINDI_EXCLUDE_DEVS" ] ; then
-        list_of_devices="`mindi --readalllink $LV_full_string`"
+        list_of_devices="`mindi --nolog --readalllink $LV_full_string 2> /dev/null`"
         l=""
         for d in $list_of_devices; do
@@ -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//`
@@ -127 +127 @@
 
 
-
-
 ProcessVolumeGroup() {
     local current_VG physical_volumes i list_of_devices VG_params
@@ -152 +150 @@
         # If multipath check which type of devide are given, mpath prefered
         for d in $list_of_devices; do
-            l="$l `mindi --readalllink $d`"
+            l="$l `mindi --nolog --readalllink $d 2> /dev/null`"
             l="$l `GiveMapperOfdm $d`"
         done
@@ -184 +182 @@
         skip=0
         l=""
-        l="$l `mindi --readalllink $d`"
+        l="$l `mindi --nolog --readalllink $d 2> /dev/null`"
         l="$l `GiveMapperOfdm $d`"
         list_of_devices="`echo $l | sort -u`"
@@ -207 +205 @@
             for d in `cat $MINDI_TMP/pv.tmp2`; do
                 skip=0
-                l="$l `mindi --readalllink $d`"
+                l="$l `mindi --nolog --readalllink $d 2> /dev/null`"
                 l="$l `GiveMapperOfdm $d`"
                 list_of_devices="`echo $l | sort -u`"
@@ -239 +237 @@
 GiveMapperOfdm () {
 
-major=`stat -c "%t" $1 2> /dev/null`
-minor=`stat -c "%T" $1 2> /dev/null`
+major=`stat -L -c "%t" $1 2> /dev/null`
+minor=`stat -L -c "%T" $1 2> /dev/null`
 
 for i in `ls /dev/mapper/*`; do
-    mj=`stat -c "%t" $i`
-    mn=`stat -c "%T" $i`
+    mj=`stat -L -c "%t" $i`
+    mn=`stat -L -c "%T" $i`
     if [ "$mj" = "$major" ] && [ "$mn" = "$minor" ]; then
         echo "$i"
         return
     fi
+done
+echo $1
+}
+
+GiveVGLVOfdm () {
+
+major=`stat -L -c "%t" $1 2> /dev/null`
+minor=`stat -L -c "%T" $1 2> /dev/null`
+
+for v in `vgs --noheadings | awk '{print $1}'`; do
+    for i in `ls /dev/$v/*`; do
+        mj=`stat -L -c "%t" $i`
+        mn=`stat -L -c "%T" $i`
+        if [ "$mj" = "$major" ] && [ "$mn" = "$minor" ]; then
+            echo "$i"
+            return
+        fi
+    done
 done
 echo $1
@@ -292 +308 @@
 
 ListAllLogicalVolumesSortedBydm() {
-        for d in `ListAllLogicalVolumes` ; do
-            dm=`mindi --readalllink $d | tail -1`
-            echo "$dm|$d" >> $MINDI_TMP/sorteddm
-        done
-        sort -t'|' $MINDI_TMP/sorteddm | cut -d'|' -f2
+    rm -f $MINDI_TMP/sorteddm
+    for d in `ListAllLogicalVolumes` ; do
+        dm=`mindi --nolog --readalllink $d 2> /dev/null | tail -1`
+        echo "$dm|$d" >> $MINDI_TMP/sorteddm
+    done
+    if [ -f $MINDI_TMP/sorteddm ]; then
+        cut -d'-' -f2- $MINDI_TMP/sorteddm | sort -t'|' -n | cut -d'|' -f2
+    fi
 }
 
@@ -333 +352 @@
 # -------------------------------- main -----------------------------------
 
+# These exports are needed to avoid bad formating of display commands (, instead of . for separator e.g.)
+# Fix #654
+export LANG=C
+export LANGUAGE=C
+
 if [ "$1" = "--givemapperofdm" ] ; then
     shift
     if [ _"$1" != _"" ] ; then
         GiveMapperOfdm $1
+    fi
+    exit 0
+fi
+
+if [ "$1" = "--givevglvofdm" ] ; then
+    shift
+    if [ _"$1" != _"" ] ; then
+        GiveVGLVOfdm $1
     fi
     exit 0