Changeset 278 in MondoRescue for trunk

Timestamp:

Jan 3, 2006, 5:06:47 PM (19 years ago)

Author:

bcornec

Message:

merge -r276:277 $SVN_M/branches/2.06

Location:

trunk

Files:

• mindi/mindi (modified) (4 diffs)
• mondo/mondo/mondorestore/mondo-rstr-compare.c (modified) (1 diff)
• mondo/mondo/restore-scripts/mondo/compare-me (modified) (1 diff)
• mondo/mondo/restore-scripts/mondo/compare-subroutine-me (modified) (2 diffs)
• mondo/mondo/restore-scripts/mondo/stablilo-me (modified) (1 diff)

trunk/mindi/mindi

@@ -808 +808 @@
     echo -en "$DONE\nMaking complete dependency list"
 
-    tr -s '/' '/' < $tempfile | sort | uniq > $tempfile.new
+    tr -s '/' '/' < $tempfile | sort -u > $tempfile.new
     mv -f $tempfile.new $tempfile
     > $outfile.pre
@@ -819 +819 @@
         cat $tempdepfile >> $outfile.pre
 #        echo "$fname ----> dependencies:-" >> $LOGFILE
-#        cat $tempdepfile | tr -s '/' '/' | sort | uniq >> $LOGFILE
+#        cat $tempdepfile | tr -s '/' '/' | sort -u >> $LOGFILE
 #        echo -en "(end of deplist of $fname)\n\n" >> $LOGFILE
         rm -f $tempdepfile
@@ -1315 +1315 @@
         mount | fgrep "$i " > /dev/null 2> /dev/null && Die "Sorry, $i is already mounted! CANNOT DO IMAGEDEV on it if it's mounted."
     done
-    [ "$IMAGE_DEVS" != "" ] && all_partitions="`echo "$all_partitions $IMAGE_DEVS" | tr ' ' '\n' | sort | uniq | tr '\n ' ' '`"
+    [ "$IMAGE_DEVS" != "" ] && all_partitions="`echo "$all_partitions $IMAGE_DEVS" | tr ' ' '\n' | sort -u | tr '\n ' ' '`"
     printf "        %-15s %-15s %-15s %-15s\n" DEVICE MOUNTPOINT FORMAT "SIZE (MB)"
     for c_p in $all_partitions ; do
@@ -2571 +2571 @@
         fi
     fi
-    possible_kernels=`echo "$possible_kernels" | tr -s ' ' '\n' | sort | uniq | tr '\n' ' '`
+    possible_kernels=`echo "$possible_kernels" | tr -s ' ' '\n' | sort -u | tr '\n' ' '`
     noof_kernels=`CountItemsIn "$possible_kernels"`
     if [ "$noof_kernels" -eq "0" ] ; then

trunk/mondo/mondo/mondorestore/mondo-rstr-compare.c

@@ -378 +378 @@
     if (length_of_file(logfile) > 5) {
         sprintf(command,
-                "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort | uniq | grep -vx \"dev/.*\" >> /tmp/changed.txt",
+                "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vx \"dev/.*\" >> /tmp/changed.txt",
                 logfile);
         system(command);

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

@@ -262 +262 @@
 
 grep -v -x "Files [^:]*:-" /tmp/compare-me.log \
-| sort | uniq > /tmp/suspect.files
+| sort -u > /tmp/suspect.files
 
 noof_lines=`grep -n "" /tmp/suspect.files | tail -n 1 | cut -d':' -f1`

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

@@ -62 +62 @@
         if [ "`cat /tmp/mck.log`" != "" ] ; then
         echo "Files which, according to md5sum, have changed:-" >> /tmp/compare-me.log
-        cat /tmp/mck.log
-        cat /tmp/mck.log >> /tmp/compare-me.log
+        cat /tmp/mck.log | tee -a /tmp/compare-me.log
         else
         LogIt "Unable to run mondo-checksum."
@@ -75 +74 @@
 if [ "`cat /tmp/afio.log`" != "" ] ; then
     echo "Files reported by afio as changed:-" > /tmp/afio.log.mashed
-    cat /tmp/afio.log | sed s/'afio: "'/'|'/ | sed s/'": '/'|'/ \
+    sed s/'afio: "'/'|'/ /tmp/afio.log | sed s/'": '/'|'/ \
 | cut -d'|' -f2 | gawk '{ if (substr($0,1,1)!="/") {print"/"$0;} \
-else {print $0;};};' | sort | uniq >> /tmp/afio.log.mashed
-    cat /tmp/afio.log.mashed
-    cat /tmp/afio.log.mashed >> /tmp/compare-me.log
+else {print $0;};};' | sort -u >> /tmp/afio.log.mashed
+    cat /tmp/afio.log.mashed | tee -a /tmp/compare-me.log
 fi
 

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

@@ -93 +93 @@
     cut -d' ' -f1 /tmp/mountlist.txt \
 | sed s/[0-9]// | sed s/[0-9]// \
-| sort | uniq | head -n 1
+| sort -u | head -n 1
 }