Changeset 276 in MondoRescue for trunk/mindi/analyze-my-lvm

Timestamp:

Jan 3, 2006, 5:01:12 PM (19 years ago)

Author:

bcornec

Message:

merge -r274:275 $SVN_M/branches/2.06

File:

• trunk/mindi/analyze-my-lvm (modified) (3 diffs)

trunk/mindi/analyze-my-lvm

@@ -1 +1 @@
 #!/bin/sh
-
+#
+# $Id$
+#
 
 #------------------------- ANALYZE-MY-LVM ----------------------- Hugo Rabson
@@ -42 +44 @@
 GetValueFromField() {
     local res
-    cat "$1" | sed s/'    '/~/ | tr -s ' ' ' ' | sed s/'~ '/'~'/ | grep -i "$2~" | cut -d'~' -f2,3,4,5 | tr '~' ' ' | gawk '{ if ($2=="MB") {printf "%sm",$1;} else if ($2=="KB") {printf "%sk",$1;} else if ($2=="GB") {printf "%sg",$1;} else {print $0;};}'
+    sed s/'    '/~/ "$1" | tr -s ' ' ' ' | sed s/'~ '/'~'/ | grep -i "$2~" | cut -d'~' -f2,3,4,5 | tr '~' ' ' | gawk '{ if ($2=="MB") {printf "%sm",$1;} else if ($2=="KB") {printf "%sk",$1;} else if ($2=="GB") {printf "%sg",$1;} else {print $0;};}'
 }
 
@@ -244 +246 @@
 # -------------------------------- main -----------------------------------
 which lvmdiskscan 2>/dev/null 2>&1 || Die "Cannot find lvmdiskscan. Are you sure you're using LVM?"
-if [ -e "/proc/lvm/global" ] && [ "`cat /proc/lvm/global | tr -s '\t' ' ' | grep "0 VGs 0 PVs 0 LVs"`" != "" ] ; then
+if [ -e "/proc/lvm/global" ] && [ "`tr -s '\t' ' ' < /proc/lvm/global | grep "0 VGs 0 PVs 0 LVs"`" != "" ] ; then
     exit 0
 fi