Changeset 953 in MondoRescue for branches

Timestamp:

Nov 19, 2006, 10:02:11 PM (18 years ago)

Author:

Bruno Cornec

Message:

• Attempt to fix mondoarchive man page (report from Andrew Latham <lathama_at_gmail.com>
• Some minor redirection of error msgs in mindi

Location:

branches/stable

Files:

• mindi/mindi (modified) (10 diffs)
• mondo-doc/mondoarchive.8 (modified) (1 diff)

branches/stable/mindi/mindi

@@ -332 +332 @@
                 BIGNO=$(($BIGNO+1))
             else
-                cp --parents -Rdf $incoming $outdir || Die "Cannot copy $incoming to $outdir - did you run out of disk space?"
+                cp --parents -Rdf $incoming $outdir 2> /dev/null || Die "Cannot copy $incoming to $outdir - did you run out of disk space?"
                 if [ "`echo "$incoming" | grep "lib/modules/.*\..*o\.gz"`" != "" ] ; then
                     gunzip -f $outdir/$incoming || LogIt "Cannot gunzip $outdir/$incoming\n"
@@ -1540 +1540 @@
     mkdir -p $MONDO_ROOT/iso/isolinux
     echo "mindi_lib = $MINDI_LIB" >> $LOGFILE
-    cp $MINDI_LIB/mem{test,disk}* $MONDO_ROOT 2>> $LOGFILE
     for i in memdisk memtest.bin memtest.img ; do
-    j=$MINDI_LIB/$i
-    k=$MINDI_TMP/iso/isolinux
-    if [ -e "$j" ] ; then
-        LogIt "Copying $j to $k\n"
-        cp -f $j $k || Die "Failed to copy $j to $k"
-        cp -f $j $MINDI_TMP || Die "Failed to copy $j to $k"
-    fi
+        j=$MINDI_LIB/$i
+        k=$MINDI_TMP/iso/isolinux
+        if [ -e "$j" ] ; then
+            LogIt "Copying $j to $k\n"
+            cp -f $j $k 2> /dev/null || Die "Failed to copy $j to $k"
+            cp -f $j $MINDI_TMP 2> /dev/null || Die "Failed to copy $j to $MINDI_TMP"
+            cp -f $j $MONDO_ROOT 2>> $LOGFILE || Die "Failed to copy $j to $MONDO_ROOT"
+        fi
     done
     MakeSyslinuxMessageFile $MINDI_TMP/iso/isolinux/message.txt
-    cp $kernelpath $MINDI_TMP/iso/isolinux/vmlinuz || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_ROOT/isolinux/vmlinuz). Did you run out of disk space?"
+    cp $kernelpath $MINDI_TMP/iso/isolinux/vmlinuz 2> /dev/null || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_ROOT/isolinux/vmlinuz). Did you run out of disk space?"
     cp $MINDI_TMP/mindi.rdz $MINDI_TMP/iso/isolinux/initrd.img
     cp $MINDI_TMP/mindi.rdz $CACHE_LOC/initrd.img
@@ -1562 +1562 @@
     fi
     if [ "$ARCH" != "ia64" ] ; then
-        cp $ISOLINUX isolinux.bin || Die "Cannot copy isolinux.bin ($ISOLINUX) to tmp_root - did you run out of disk space?"
+        cp $ISOLINUX isolinux.bin 2> /dev/null || Die "Cannot copy isolinux.bin ($ISOLINUX) to tmp_root - did you run out of disk space?"
         cp $ISOLINUX ../
     fi
     cd $MINDI_TMP/iso
     if [ "$ARCH" != "ia64" ] ; then
-        cp -f $MINDI_TMP/iso/isolinux/{isolinux.cfg,initrd.img,vmlinuz,isolinux.bin,message.txt} $MONDO_ROOT || Die "Cannot copy core files to ramdisk for boot disk. Did you run out of disk space?"
+        cp -f $MINDI_TMP/iso/isolinux/{isolinux.cfg,initrd.img,vmlinuz,isolinux.bin,message.txt} $MONDO_ROOT 2> /dev/null || Die "Cannot copy core files to ramdisk for boot disk. Did you run out of disk space?"
     fi
     [ "$MONDO_SHARE" ] && cp -f $MONDO_SHARE/autorun .   
@@ -2094 +2094 @@
         LogIt "Creating /dev/boot_device ($j)\n"
         mkdir -p $bigdir/dev
-        cp -pRdf $j $bigdir/dev/boot_device || Die "Unable to create /dev/boot_device on ramdisk"
+        cp -pRdf $j $bigdir/dev/boot_device 2> /dev/null || Die "Unable to create /dev/boot_device on ramdisk"
     fi
 
@@ -2123 +2123 @@
     MakeMountlist $MINDI_TMP/mountlist.txt
     mkdir -p $minidir_root/$noof_disks/tmp
-    cp -f $MINDI_TMP/mountlist.txt $minidir_root/$noof_disks/tmp/mountlist.txt || Die "Cannot copy mountlist.txt from $MINDI_TMP to data disk"
+    cp -f $MINDI_TMP/mountlist.txt $minidir_root/$noof_disks/tmp/mountlist.txt 2> /dev/null || Die "Cannot copy mountlist.txt from $MINDI_TMP to data disk"
     [ "`DidMondoCallMe`" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MINDI_TMP/.
     [ $LVM != "false" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
@@ -2507 +2507 @@
     old_pwd=`pwd`
     cd $mountpoint
-    cp -Rdf $tgz_dir_fname/* . 2>> $LOGFILE >> $LOGFILE
+    cp -Rdf $tgz_dir_fname/* . &>> $LOGFILE
     tar -zxf symlinks.tgz || Die "Cannot untar symlinks.tgz"
     cd dev || Die "Can't cd to dev"
@@ -2578 +2578 @@
         [ "$YOUR_KERNEL_SUCKS" ] && i=$MINDI_TMP/$i
         echo "Adding $i ($s KB) to the rootfs" >> $LOGFILE
-        cp -df $i $mountpoint/ || LogIt "Unable to copy $i to $mountpoint\n"
+        cp -df $i $mountpoint/ 2>/dev/null || LogIt "Unable to copy $i to $mountpoint\n"
         [ "`echo "$i" | grep -F ".gz"`" ] && gunzip -f $mountpoint/`basename $i`
     done
@@ -2595 +2595 @@
         MakeMondoConfigFile $mountpoint/tmp/mondo-restore.cfg
         cp -f $mountpoint/tmp/mondo-restore.cfg $MINDI_TMP &> /dev/null
-        cp -f $MINDI_TMP/mountlist.txt $mountpoint/tmp/ || Die "Cannot copy mountlist to ramdisk"
+        cp -f $MINDI_TMP/mountlist.txt $mountpoint/tmp/ 2>/dev/null || Die "Cannot copy mountlist to ramdisk"
         echo -en "$FILES_IN_FILELIST" > $mountpoint/tmp/FILES-IN-FILELIST
         echo -en "$LAST_FILELIST_NUMBER" > $mountpoint/tmp/LAST-FILELIST-NUMBER
@@ -2774 +2774 @@
         rm -rf $MINDI_TMP
         MINDI_TMP=$MONDO_TMP
+        mkdir -p $MINDI_TMP
         FDISKLOG=$MINDI_TMP/parted2fdisk.log
         CACHE_LOC=$3
@@ -2885 +2886 @@
     mkdir -p $MINDI_TMP/small-all/tmp
     cd $MINDI_TMP/small-all
-    cp -f $MINDI_TMP/{mountlist.txt,mondo-restore.cfg,filelist.full.gz,biggielist.txt} tmp || Die "Cannot copy small all.tar.gz"
+    cp -f $MINDI_TMP/{mountlist.txt,mondo-restore.cfg,filelist.full.gz,biggielist.txt} tmp 2>/dev/null || Die "Cannot copy small all.tar.gz"
     tar -cv tmp | gzip -9 > $MINDI_TMP/all.tar.gz || Die "Cannot make small all.tar.gz"
     sleep 2

branches/stable/mondo-doc/mondoarchive.8

@@ -365 +365 @@
 for its ISO's unless you exclude it, as follows:-
 .br
-.I "mondoarchive -Oi -d /mnt/foo -E \"/mnt/foo /mnt/foo2\" -p `hostname`-`date +%Y-%m-%d`"
+.I "mondoarchive -Oi -d /mnt/foo -E '/mnt/foo /mnt/foo2' -p `hostname`-`date +%Y-%m-%d`"
 
 Backup to ISO's non-interactively, e.g. as a job running in /etc/cron.daily: