Changeset 274 in MondoRescue for trunk/mondo/mondo/restore-scripts/mondo

Timestamp:

Jan 3, 2006, 4:15:54 PM (18 years ago)

Author:

bcornec

Message:

merge -r272:273 $SVN_M/branches/2.06

Location:

trunk/mondo/mondo/restore-scripts/mondo

Files:

• compare-me (modified) (3 diffs)
• grub-MR (modified) (2 diffs)
• hack-fstab (modified) (2 diffs)
• hack-lilo (modified) (3 diffs)
• label-partitions-as-necessary (modified) (1 diff)
• make-me-bootable (modified) (1 diff)
• mount-me (modified) (1 diff)
• restore-bigfiles-from-iso (modified) (1 diff)
• stablilo-me (modified) (1 diff)
• unmount-me (modified) (1 diff)

trunk/mondo/mondo/restore-scripts/mondo/compare-me

@@ -104 +104 @@
     padded_bfnum=`printf "%07d" $bf_num`
     slice_fname=`GiveSliceName $bf_num $slice_num`
-    checksum=`cat $slice_fname | cut -f1`
-#    finalsize=`cat $slice_fname | cut -f2`
-    i=`cat $slice_fname | cut -f3`
+    checksum=`cut -f1 $slice_fname`
+#    finalsize=`cut -f2 $slice_fname`
+    i=`cut -f3 $slice_fname`
     outputfile=/mnt/RESTORING/"$i"
     echo -n "$i "
@@ -164 +164 @@
         outcome=$?
             retval=$(($retval+$outcome))
-        cat /tmp/rsm.log | grep -v "ignored" > /tmp/rsm.2.log
+        grep -v ignored /tmp/rsm.log > /tmp/rsm.2.log
         if [ "$outcome" -ne "0" ] ; then
         echo -e -n "                                                                            \r"
@@ -261 +261 @@
 fi
 
-cat /tmp/compare-me.log \
-| grep -v -x "Files [^:]*:-" \
+grep -v -x "Files [^:]*:-" /tmp/compare-me.log \
 | sort | uniq > /tmp/suspect.files
 

trunk/mondo/mondo/restore-scripts/mondo/grub-MR

@@ -64 +64 @@
     BOOTPATHNAME=""
     for sz in /boot / ; do
-    bootpart=`cat $2 | grep " $sz " | cut -d' ' -f1 | head -n1`
+    bootpart=`grep " $sz " $2 | cut -d' ' -f1 | head -n1`
     [ "$bootpart" ] && [ -e "/mnt/RESTORING/$bootpart" ] && break
     done
@@ -164 +164 @@
 if echo $bootpart | grep "/md" > /dev/null ; then
     base=`basename $bootpart`
-    line=`cat /proc/mdstat | grep $base | head -n1`
+    line=`grep $base /proc/mdstat | head -n1`
     echo "mbrpart was $mbrpart"
     mbrpart=`parted2fdisk -l | grep /dev/ | head -n1 | tr ':' ' ' \

trunk/mondo/mondo/restore-scripts/mondo/hack-fstab

@@ -30 +30 @@
     size=`echo "$incoming"       | cut -d' ' -f4`
 #    echo "'$device' '$mountpoint' '$format' '$size'" > /dev/stderr
-    original_fstab_line=`cat $old_fstab | grep " $mountpoint " | grep -v "#" | tr -s ' ' ' '`
+    original_fstab_line=`grep " $mountpoint " $old_fstab | grep -v "#" | tr -s ' ' ' '`
 #    echo "original_fstab_line = $original_fstab_line" >> /dev/stderr
-    if [ "`cat $old_fstab | grep "LABEL="`" != "" ] ; then
+    if [ "`grep "LABEL=" $old_fstab`" != "" ] ; then
     if [ "$format" = "ext2" ] || [ "$format" = "ext3" ] ; then
         device="LABEL=$mountpoint"
@@ -89 +89 @@
     col2=`echo "$incoming" | cut -f2`
     col_rest=`echo "$incoming" | cut -f3-19 | tr -s ' ' ' '`
-    orig="`cat $old_fstab | grep " $col2 " | cut -f1`"
+    orig="`grep " $col2 " $old_fstab | cut -f1`"
     if [ "`echo "$orig" | grep "LABEL="`" != "" ] ; then
     echo "orig = $orig" >> /dev/stderr

trunk/mondo/mondo/restore-scripts/mondo/hack-lilo

@@ -54 +54 @@
     newdev=`GetNewFstabMountpoint $dev`
     if [ ! "$newdev" ] ; then
-    col2=`cat $old_mountlist | grep "$dev " | cut -d' ' -f2`
-    col1_new=`cat $new_mountlist | grep " $col2 " | cut -d' ' -f1`
+    col2=`grep "$dev " $old_mountlist | cut -d' ' -f2`
+    col1_new=`grep " $col2 " $new_mountlist | cut -d' ' -f1`
     newdev="$col1_new"
     if [ ! "$newdev" ] ; then
@@ -61 +61 @@
     fi
     fi
-#    old_fstab_line=`cat $new_fstab | grep "$dev"`
+#    old_fstab_line=`grep "$dev" $new_fstab`
     [ "$2" = "other" ] || echo -e -n "\t"
     echo -e "$2=$newdev"
@@ -135 +135 @@
 ProcessLilo < $old_lilo >> $outfile
 chmod 600 $outfile
-cat $bootlistfile | sort | uniq > $bootlistfile
+sort -u $bootlistfile -o $bootlistfile
 
 #------ disabled 12/10/01 (doesn't do anything anyway *g*)

trunk/mondo/mondo/restore-scripts/mondo/label-partitions-as-necessary

@@ -28 +28 @@
     mountline=`mount | grep " $label "`
 #   mountpt=`echo "$mountline" | cut -d' ' -f1`
-!   mountpt=`cat $mountlist | grep " $label " | cut -d' ' -f1`
+!   mountpt=`grep " $label " $mountlist | cut -d' ' -f1`
         if [ ! "$mountpt" ] ; then
             LogIt "Not labeling anything as $label because $mountpt is not a mountpoint"

trunk/mondo/mondo/restore-scripts/mondo/make-me-bootable

@@ -19 +19 @@
 HAVE_ACTIVE="false"
 for i in `cat $1 | tr -s '\t' ' ' | cut -d' ' -f1 | grep -v "/dev/fd" | grep -v "none" | grep -v "#"` ; do
-    mountpt=`cat $1 | grep "$i " | tr -s '\t' ' ' | cut -d' ' -f2`
-    format=`cat $1 | grep "$i " | tr -s '\t' ' ' | cut -d' ' -f3`
+    mountpt=`grep "$i " $1 | tr -s '\t' ' ' | cut -d' ' -f2`
+    format=`grep "$i " $1 | tr -s '\t' ' ' | cut -d' ' -f3`
     drive=`echo $i | sed -e 's/[0-9]*$//' -e 's/\([0-9]\)p$/\1/'`
     partno=`echo $i | sed -e 's/^.*[^0-9]\([0-9]*\)$/\1/'`

trunk/mondo/mondo/restore-scripts/mondo/mount-me

@@ -14 +14 @@
 fi
 
-paths=`cat $mountlist | grep -v " raid " | grep -v "lvm lvm" | tr -s ' ' ' ' | cut -d' ' -f2 | sort`
+paths=`grep -v " raid " $mountlist | grep -v "lvm lvm" | tr -s ' ' ' ' | cut -d' ' -f2 | sort`
 > $mountlist.sorted
 for i in $paths ; do

trunk/mondo/mondo/restore-scripts/mondo/restore-bigfiles-from-iso

@@ -41 +41 @@
         echo -en "."
         if echo "$slicename" | grep "slice-[0-9]*.00000\.dat" 2> /dev/null; then
-            CHECKSUM=`cat $slicename | head -n1 | cut -f1`
-            OUTFNAME=`cat $slicename | head -n1 | cut -f2`
+            CHECKSUM=`head -n1 $slicename | cut -f1`
+            OUTFNAME=`head -n1 $slicename | cut -f2`
             OUTFNAME=`echo "$restorepath/$OUTFNAME" | tr -s '/' '/'`
             echo "Now restoring $OUTFNAME"

trunk/mondo/mondo/restore-scripts/mondo/stablilo-me

@@ -91 +91 @@
 
 WhatIsFirstDriveCalled() {
-    cat /tmp/mountlist.txt | cut -d' ' -f1 \
+    cut -d' ' -f1 /tmp/mountlist.txt \
 | sed s/[0-9]// | sed s/[0-9]// \
 | sort | uniq | head -n 1

trunk/mondo/mondo/restore-scripts/mondo/unmount-me

@@ -17 +17 @@
 done
 
-for i in `cat /proc/swaps | cut -d' ' -f1 | grep /dev`; do
+for i in `cut -d' ' -f1 /proc/swaps | grep /dev`; do
     swapoff $i
 done