Changeset 276 in MondoRescue for trunk

Timestamp:

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

Author:

bcornec

Message:

merge -r274:275 $SVN_M/branches/2.06

Location:

trunk

Files:

• mindi/analyze-my-lvm (modified) (3 diffs)
• mindi/mindi (modified) (10 diffs)
• mindi/rootfs/sbin/hack-cfg-if-necessary (modified) (2 diffs)
• mondo/mondo/common/libmondo-devices.c (modified) (1 diff)
• mondo/mondo/common/libmondo-filelist.c (modified) (1 diff)
• mondo/mondo/common/libmondo-tools.c (modified) (1 diff)
• mondo/mondo/mondo-makefilelist (modified) (4 diffs)
• mondo/mondo/mondorestore/mondo-rstr-compare.c (modified) (1 diff)
• mondo/mondo/restore-scripts/mondo/hack-lilo (modified) (2 diffs)
• mondo/mondo/restore-scripts/mondo/stabelilo-me (modified) (1 diff)
• tools/rpm-env (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

trunk/mindi/mindi

@@ -808 +808 @@
     echo -en "$DONE\nMaking complete dependency list"
 
-    cat $tempfile | tr -s '/' '/' | sort | uniq > $tempfile.new
+    tr -s '/' '/' < $tempfile | sort | uniq > $tempfile.new
     mv -f $tempfile.new $tempfile
     > $outfile.pre
@@ -863 +863 @@
     fi
     fi
-     cat $outfile.pre | tr ' ' '\n' | tr -s '/' '/' | fgrep -vx "" | sort -u | egrep -v "/libX11|/libXext|/libXi|/libgtk|/libgdk" > $outfile
+     tr ' ' '\n' < $outfile.pre | tr -s '/' '/' | fgrep -vx "" | sort -u | egrep -v "/libX11|/libXext|/libXi|/libgtk|/libgdk" > $outfile
     rm -f $tempfile $outfile.pre
     [ "$res" -eq "0" ] && echo -e "\r\t\t\t\t\t\t\t\t$DONE" || echo "\nFailed."
@@ -1246 +1246 @@
     if [ $tmpmodprobe_flag == "Y" ] ; then
     infile="/tmp/modprobe.conf.mindi.$$"
-    cat `find /etc/modprobe.d -maxdepth 1 -name "*" -xtype f` > $infile
+    find /etc/modprobe.d -maxdepth 1 -name "*" -xtype f > $infile
     else
     infile="/etc/modules.conf"
@@ -1331 +1331 @@
     [ "$c_p" = "none" ] && continue
         absolute_partition=`ResolveSoftlink $c_p`
-    partition_mountpt=`cat $MY_FSTAB | tr -s '\t' ' ' | grep -w "$current_partition" | grep -vx " *#.*" | $AWK '{print $2}' | head -n1`
+    partition_mountpt=`tr -s '\t' ' ' < $MY_FSTAB | grep -w "$current_partition" | grep -vx " *#.*" | $AWK '{print $2}' | head -n1`
     redhat_label=""
     if [ "`echo "$current_partition" | fgrep -i "LABEL="`" != "" ] ; then
@@ -1358 +1358 @@
             totalsize=0
             items=0
-            for i in `cat /proc/swaps | tr -s ' ' '\t' | fgrep -v "Filename" | cut -f3` ; do
+            for i in `tr -s ' ' '\t' < /proc/swaps | fgrep -v "Filename" | cut -f3` ; do
             totalsize=$(($totalsize+$i))
             items=$(($items+1))
@@ -1472 +1472 @@
     echo -en "  " > $1
     if [ "`fgrep -i "debian" /etc/issue.net 2> /dev/null`" ] ; then
-        cat $MINDI_LIB/msg-txt | sed s/ZZZZZ/$MINDI_VERSION/ | sed s/YYYYY/"Mondo Rescue"/ | sed s/XXXXX/"a cousin of"/ | sed s%DDDDD%"Debian GNU\/`uname -s` `cut -d ' ' -f 3 /etc/issue.net` `hostname`"% | sed s/KKKKK/"Kernel `uname  -r` on a `uname -m`"/ | sed s/TTTTT/"`LC_TIME=C date`"/ >> $1.tmp
-    else
-        cat $MINDI_LIB/msg-txt | sed s/ZZZZZ/$MINDI_VERSION/ | sed s/YYYYY/"Mondo Rescue"/ | sed s/XXXXX/"a cousin of"/ | sed s/DDDDD/"`grep -i "linux" /etc/issue.net | head -n1 | tr -s ' ' ' '`"/ | sed s/KKKKK/"`grep -i "kernel" /etc/issue.net | head -n1 | tr -s ' ' ' '`"/ | sed s/TTTTT/"`LC_TIME=C date`"/ | sed s/' '\\r' 'on' 'an' '\/' '`uname -r`' 'on' 'an' '`uname -m`/ >> $1.tmp
-    fi
-    cat $1.tmp | sed s/%r/"`uname -r`"/ | sed s/%t/"`hostname`"/ > $1
+        sed s/ZZZZZ/$MINDI_VERSION/ $MINDI_LIB/msg-txt | sed s/YYYYY/"Mondo Rescue"/ | sed s/XXXXX/"a cousin of"/ | sed s%DDDDD%"Debian GNU\/`uname -s` `cut -d ' ' -f 3 /etc/issue.net` `hostname`"% | sed s/KKKKK/"Kernel `uname  -r` on a `uname -m`"/ | sed s/TTTTT/"`LC_TIME=C date`"/ >> $1.tmp
+    else
+        sed s/ZZZZZ/$MINDI_VERSION/ $MINDI_LIB/msg-txt | sed s/YYYYY/"Mondo Rescue"/ | sed s/XXXXX/"a cousin of"/ | sed s/DDDDD/"`grep -i "linux" /etc/issue.net | head -n1 | tr -s ' ' ' '`"/ | sed s/KKKKK/"`grep -i "kernel" /etc/issue.net | head -n1 | tr -s ' ' ' '`"/ | sed s/TTTTT/"`LC_TIME=C date`"/ | sed s/' '\\r' 'on' 'an' '\/' '`uname -r`' 'on' 'an' '`uname -m`/ >> $1.tmp
+    fi
+    sed s/%r/"`uname -r`"/ $1.tmp | sed s/%t/"`hostname`"/ > $1
     rm -f $1.tmp
     if [ "$CDRECOVERY" != "yes" ] ; then
@@ -1596 +1596 @@
     if [ -e "$MONDO_TMP/start-nfs" ] ; then
     mv isolinux.cfg isolinux.cfg.old
-    cat isolinux.cfg.old | sed s/interactive/iso/ > isolinux.cfg
+    sed s/interactive/iso/ isolinux.cfg.old > isolinux.cfg
     fi
     if [ "$ARCH" != "ia64" ] ; then
@@ -1641 +1641 @@
     disksize=$1
     if [ "`fgrep -i "debian" /etc/issue.net 2> /dev/null`" ] ; then
-        cat $MINDI_LIB/msg-txt | sed s/ZZZZZ/$MINDI_VERSION/ | sed s/YYYYY/"Mondo Rescue"/ | sed s/XXXXX/"a cousin of"/ | sed s%DDDDD%"Debian GNU\/`uname -s` `cut -d ' ' -f 3 /etc/issue.net` `hostname`"% | sed s/KKKKK/"Kernel `uname  -r` on a `uname -m`"/ | sed s/TTTTT/"`LC_TIME=C date`"/
-    else
-        cat $MINDI_LIB/msg-txt | sed s/ZZZZZ/$MINDI_VERSION/ | sed s/YYYYY/"Mondo Rescue"/ | sed s/XXXXX/"a cousin of"/ | sed s/DDDDD/"`grep -i "linux" /etc/issue.net | head -n1 | tr -s ' ' ' '`"/ | sed s/KKKKK/"`grep -i "kernel" /etc/issue.net | head -n1 | tr -s ' ' ' '`"/ | sed s/TTTTT/"`LC_TIME=C date`"/ | sed s/' 'r' 'on' 'an' 'm/' '`uname -r`' 'on' 'an' '`uname -m`/
+        sed s/ZZZZZ/$MINDI_VERSION/ $MINDI_LIB/msg-txt | sed s/YYYYY/"Mondo Rescue"/ | sed s/XXXXX/"a cousin of"/ | sed s%DDDDD%"Debian GNU\/`uname -s` `cut -d ' ' -f 3 /etc/issue.net` `hostname`"% | sed s/KKKKK/"Kernel `uname  -r` on a `uname -m`"/ | sed s/TTTTT/"`LC_TIME=C date`"/
+    else
+        sed s/ZZZZZ/$MINDI_VERSION/ $MINDI_LIB/msg-txt | sed s/YYYYY/"Mondo Rescue"/ | sed s/XXXXX/"a cousin of"/ | sed s/DDDDD/"`grep -i "linux" /etc/issue.net | head -n1 | tr -s ' ' ' '`"/ | sed s/KKKKK/"`grep -i "kernel" /etc/issue.net | head -n1 | tr -s ' ' ' '`"/ | sed s/TTTTT/"`LC_TIME=C date`"/ | sed s/' 'r' 'on' 'an' 'm/' '`uname -r`' 'on' 'an' '`uname -m`/
     fi
     if [ "$disksize" -gt "2880" ] ; then
@@ -2018 +2018 @@
     if [ -e "$MONDO_TMP/start-nfs" ] ; then
     mv syslinux.cfg syslinux.cfg.orig
-    cat syslinux.cfg.orig | sed s/interactive/iso/ > syslinux.cfg
+    sed s/interactive/iso/ syslinux.cfg.orig > syslinux.cfg
     fi
     cd $old_pwd
@@ -2447 +2447 @@
     tempfile=$TMP_ROOT/$$.strip.txt
     cp -f $1 $tempfile
-    cat $tempfile | $AWK '{if (substr($0,0,1)!="#" || substr($0,0,3)=="#!/") {print $0;};}' > $1
+    $AWK '{if (substr($0,0,1)!="#" || substr($0,0,3)=="#!/") {print $0;};}' $tempfile > $1
     rm -f $tempfile
     echo "Stripped comments from $2" >> $LOGFILE

trunk/mindi/rootfs/sbin/hack-cfg-if-necessary

@@ -1 +1 @@
 #!/bin/sh
+#
+# $Id$
+#
 
 if ! mount | grep cdrom ; then 
@@ -20 +23 @@
 LogIt "Re-jigging mondo-restore.cfg because you backed up to ISOs and then burned them to CDs" 1
 mv -f /tmp/mondo-restore.cfg /tmp/mrco
-cat /tmp/mrco | sed 's/backup-media-type iso/backup-media-type cdr/' > /tmp/mondo-restore.cfg
+sed 's/backup-media-type iso/backup-media-type cdr/' /tmp/mrco > /tmp/mondo-restore.cfg
 LogIt "Done re-jigging. Yay."
 exit 0

trunk/mondo/mondo/common/libmondo-devices.c

@@ -2018 +2018 @@
     asprintf(&exclude_these_devices,
            call_program_and_get_last_line_of_output
-           ("cat /etc/fstab | tr -s '\t' ' ' | grep -E '( (coda|ncpfs|nfs|smbfs|cifs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
+           ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|smbfs|cifs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
     asprintf(&result_sz, "%s", exclude_these_directories);
     paranoid_free(exclude_these_devices);

trunk/mondo/mondo/common/libmondo-filelist.c

@@ -490 +490 @@
 //      sort_file(filelist); // FIXME - filelist chopper sorts, so this isn't necessary
         asprintf(&command,
-                 "cat %s | getfacl --all-effective -P - 2>> %s | gzip -c1 > %s 2>> %s",
+                 "getfacl --all-effective -P %s 2>> %s | gzip -c1 > %s 2>> %s",
                  filelist, MONDO_LOGFILE, facl_fname, MONDO_LOGFILE);
         iamhere(command);

trunk/mondo/mondo/common/libmondo-tools.c

@@ -173 +173 @@
 file=$i/.directory; if [ -f \"$file\" ] ; then mv -f $file $file.old ; \
 awk '{if (index($0, \"rootimagesmindi\")) { while (length($0)>2) { getline;} ; } \
-else { print $0;};}'$file.old  > $file ; fi ; done");
+else { print $0;};}' $file.old  > $file ; fi ; done");
     run_program_and_log_output(tmp, 5);
     paranoid_free(tmp);

trunk/mondo/mondo/mondo-makefilelist

@@ -1 +1 @@
 #!/bin/sh
+#
+# $Id$
+
 #
 # mondo-makefilelist
@@ -82 +85 @@
     res=`grep -v "Permission denied" $TMP/find.log`
     if [ "$res" != "" ] ; then
-    cat $TMP/find.log
-    cat $TMP/find.log >> $LOGFILE
+    cat $TMP/find.log | tee -a $LOGFILE
     fi
 # include various directory _paths_ (not contents of dirs: that comes later)
@@ -105 +107 @@
 
 # Patch from Andy Glass - 03/03/2002
-    for i in `cat /etc/fstab | tr -s '\t' ' ' | cut -d' ' -f2 | grep -v '-'` ; do
+    for i in `tr -s '\t' ' ' < /etc/fstab | cut -d' ' -f2 | grep -v '-'` ; do
 # End patch
-#     for i in `cat /etc/fstab | tr -s '\t' ' ' | cut -d' ' -f2` ; do
         grep -vx "$i/lost+found" $output | grep -vx $i"lost+found" > $output.MID
         sync
@@ -113 +114 @@
     done
 # exclude .journal files (ext3)
-    for i in `cat /etc/fstab | tr -s '\t' ' ' | grep "ext3" | cut -d' ' -f2` ; do
+    for i in `tr -s '\t' ' ' < /etc/fstab | grep "ext3" | cut -d' ' -f2` ; do
     grep -vx "$i/\.journal" $output | grep -vx "$i\.journal" | grep -vx "$i\.autofsck" > $output.MID
         sync

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

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

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

@@ -15 +15 @@
 GetOldFstabMountpoint() {
     local res
-    res=`cat $old_fstab | tr -s '\t' ' ' | grep "$1" | cut -d' ' -f2`
+    res=`tr -s '\t' ' ' < $old_fstab | grep "$1" | cut -d' ' -f2`
 #    echo "old_fstab = $old_fstab" >> /dev/stderr
     if [ "$res" = "" ] ; then
 #   echo "OK, resB" >> /dev/stderr
-    res=`cat $old_mountlist | tr -s '\t' ' ' | grep " $1 " | cut -d' ' -f1`
+    res=`tr -s '\t' ' ' < $old_mountlist | grep " $1 " | cut -d' ' -f1`
     fi
     echo "$res"
@@ -34 +34 @@
     old_mountpoint=`GetOldFstabMountpoint $1`
 #    echo "old_mountpoint = $old_mountpoint" >> /dev/stderr
-    new_mountpoint=`cat $new_mountlist | tr -s '\t' ' ' | grep " $old_mountpoint" | cut -d' ' -f1`
+    new_mountpoint=`tr -s '\t' ' ' < $new_mountlist | grep " $old_mountpoint" | cut -d' ' -f1`
     if [ "$new_mountpoint" = "" ] ; then
-    mtpt=`cat $new_mountlist | tr -s '\t' ' ' | grep " $old_mountpoint " | cut -d' ' -f2`
-    dev=`cat $new_mountlist | tr -s '\t' ' ' | grep " $mtpt " | cut -d' ' -f1`
+    mtpt=`tr -s '\t' ' ' < $new_mountlist | grep " $old_mountpoint " | cut -d' ' -f2`
+    dev=`tr -s '\t' ' ' < $new_mountlist | grep " $mtpt " | cut -d' ' -f1`
 #   echo "NEW_MP (A) = $dev" >> /dev/stderr
 #    else

trunk/mondo/mondo/restore-scripts/mondo/stabelilo-me

@@ -86 +86 @@
 
 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
+| sort -u | head -n 1
 }
 

trunk/tools/rpm-env

@@ -35 +35 @@
 if [ -e /etc/mandriva-release ]; then
     export ddir="mandriva"
-    export dver=`cat /etc/mandriva-release | awk '{print $4}'`
+    export dver=`awk '{print $4}' /etc/mandriva-release`
     export suf="${dver}mdk"
 elif [ -e /etc/mandrake-release ]; then
     export ddir="mandrake"
-    export dver=`cat /etc/mandrake-release | awk '{print $3}'`
+    export dver=`awk '{print $3}' /etc/mandrake-release`
     export suf="${dver}mdk"
 elif [ -e /etc/redhat-release ]; then
@@ -45 +45 @@
     if [ $? -eq 0 ]; then
         export ddir="rhel"
-        export dver=`cat /etc/redhat-release | awk '{print $7}'`
+        export dver=`awk '{print $7}' /etc/redhat-release`
     elif grep -q Fedora /etc/redhat-release ; then
         export ddir="fedora"
-        export dver=`cat /etc/redhat-release | awk '{print $4}'`
+        export dver=`awk '{print $4}' /etc/redhat-release`
         export suf="fc${dver}"
     else
         export ddir="redhat"
-        export dver=`cat /etc/redhat-release | awk '{print $5}' | sed "s/\.//"`
+        export dver=`awk '{print $5}' /etc/redhat-release | sed "s/\.//"`
         export suf="rh${dver}"
     fi
@@ -59 +59 @@
     if [ $? -eq 0 ]; then
         export ddir="sles"
-        export dver=`cat /etc/SuSE-release | head -1 | awk '{print $5}'`
+        export dver=`head -1 /etc/SuSE-release | awk '{print $5}'`
     else
         export ddir="suse"
-        export dver=`cat /etc/SuSE-release | head -1 | awk '{print $3}'`
+        export dver=`head -1 /etc/SuSE-release | awk '{print $3}'`
     fi
 else