Changeset 953


Ignore:
Timestamp:
Nov 19, 2006, 10:02:11 PM (12 years ago)
Author:
bruno
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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/mindi

    r949 r953  
    332332                BIGNO=$(($BIGNO+1))
    333333            else
    334                 cp --parents -Rdf $incoming $outdir || Die "Cannot copy $incoming to $outdir - did you run out of disk space?"
     334                cp --parents -Rdf $incoming $outdir 2> /dev/null || Die "Cannot copy $incoming to $outdir - did you run out of disk space?"
    335335                if [ "`echo "$incoming" | grep "lib/modules/.*\..*o\.gz"`" != "" ] ; then
    336336                    gunzip -f $outdir/$incoming || LogIt "Cannot gunzip $outdir/$incoming\n"
     
    15401540    mkdir -p $MONDO_ROOT/iso/isolinux
    15411541    echo "mindi_lib = $MINDI_LIB" >> $LOGFILE
    1542     cp $MINDI_LIB/mem{test,disk}* $MONDO_ROOT 2>> $LOGFILE
    15431542    for i in memdisk memtest.bin memtest.img ; do
    1544     j=$MINDI_LIB/$i
    1545     k=$MINDI_TMP/iso/isolinux
    1546     if [ -e "$j" ] ; then
    1547         LogIt "Copying $j to $k\n"
    1548         cp -f $j $k || Die "Failed to copy $j to $k"
    1549         cp -f $j $MINDI_TMP || Die "Failed to copy $j to $k"
    1550     fi
     1543        j=$MINDI_LIB/$i
     1544        k=$MINDI_TMP/iso/isolinux
     1545        if [ -e "$j" ] ; then
     1546            LogIt "Copying $j to $k\n"
     1547            cp -f $j $k 2> /dev/null || Die "Failed to copy $j to $k"
     1548            cp -f $j $MINDI_TMP 2> /dev/null || Die "Failed to copy $j to $MINDI_TMP"
     1549            cp -f $j $MONDO_ROOT 2>> $LOGFILE || Die "Failed to copy $j to $MONDO_ROOT"
     1550        fi
    15511551    done
    15521552    MakeSyslinuxMessageFile $MINDI_TMP/iso/isolinux/message.txt
    1553     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?"
     1553    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?"
    15541554    cp $MINDI_TMP/mindi.rdz $MINDI_TMP/iso/isolinux/initrd.img
    15551555    cp $MINDI_TMP/mindi.rdz $CACHE_LOC/initrd.img
     
    15621562    fi
    15631563    if [ "$ARCH" != "ia64" ] ; then
    1564         cp $ISOLINUX isolinux.bin || Die "Cannot copy isolinux.bin ($ISOLINUX) to tmp_root - did you run out of disk space?"
     1564        cp $ISOLINUX isolinux.bin 2> /dev/null || Die "Cannot copy isolinux.bin ($ISOLINUX) to tmp_root - did you run out of disk space?"
    15651565        cp $ISOLINUX ../
    15661566    fi
    15671567    cd $MINDI_TMP/iso
    15681568    if [ "$ARCH" != "ia64" ] ; then
    1569         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?"
     1569        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?"
    15701570    fi
    15711571    [ "$MONDO_SHARE" ] && cp -f $MONDO_SHARE/autorun .   
     
    20942094        LogIt "Creating /dev/boot_device ($j)\n"
    20952095        mkdir -p $bigdir/dev
    2096         cp -pRdf $j $bigdir/dev/boot_device || Die "Unable to create /dev/boot_device on ramdisk"
     2096        cp -pRdf $j $bigdir/dev/boot_device 2> /dev/null || Die "Unable to create /dev/boot_device on ramdisk"
    20972097    fi
    20982098
     
    21232123    MakeMountlist $MINDI_TMP/mountlist.txt
    21242124    mkdir -p $minidir_root/$noof_disks/tmp
    2125     cp -f $MINDI_TMP/mountlist.txt $minidir_root/$noof_disks/tmp/mountlist.txt || Die "Cannot copy mountlist.txt from $MINDI_TMP to data disk"
     2125    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"
    21262126    [ "`DidMondoCallMe`" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MINDI_TMP/.
    21272127    [ $LVM != "false" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
     
    25072507    old_pwd=`pwd`
    25082508    cd $mountpoint
    2509     cp -Rdf $tgz_dir_fname/* . 2>> $LOGFILE >> $LOGFILE
     2509    cp -Rdf $tgz_dir_fname/* . &>> $LOGFILE
    25102510    tar -zxf symlinks.tgz || Die "Cannot untar symlinks.tgz"
    25112511    cd dev || Die "Can't cd to dev"
     
    25782578        [ "$YOUR_KERNEL_SUCKS" ] && i=$MINDI_TMP/$i
    25792579        echo "Adding $i ($s KB) to the rootfs" >> $LOGFILE
    2580         cp -df $i $mountpoint/ || LogIt "Unable to copy $i to $mountpoint\n"
     2580        cp -df $i $mountpoint/ 2>/dev/null || LogIt "Unable to copy $i to $mountpoint\n"
    25812581        [ "`echo "$i" | grep -F ".gz"`" ] && gunzip -f $mountpoint/`basename $i`
    25822582    done
     
    25952595        MakeMondoConfigFile $mountpoint/tmp/mondo-restore.cfg
    25962596        cp -f $mountpoint/tmp/mondo-restore.cfg $MINDI_TMP &> /dev/null
    2597         cp -f $MINDI_TMP/mountlist.txt $mountpoint/tmp/ || Die "Cannot copy mountlist to ramdisk"
     2597        cp -f $MINDI_TMP/mountlist.txt $mountpoint/tmp/ 2>/dev/null || Die "Cannot copy mountlist to ramdisk"
    25982598        echo -en "$FILES_IN_FILELIST" > $mountpoint/tmp/FILES-IN-FILELIST
    25992599        echo -en "$LAST_FILELIST_NUMBER" > $mountpoint/tmp/LAST-FILELIST-NUMBER
     
    27742774        rm -rf $MINDI_TMP
    27752775        MINDI_TMP=$MONDO_TMP
     2776        mkdir -p $MINDI_TMP
    27762777        FDISKLOG=$MINDI_TMP/parted2fdisk.log
    27772778        CACHE_LOC=$3
     
    28852886    mkdir -p $MINDI_TMP/small-all/tmp
    28862887    cd $MINDI_TMP/small-all
    2887     cp -f $MINDI_TMP/{mountlist.txt,mondo-restore.cfg,filelist.full.gz,biggielist.txt} tmp || Die "Cannot copy small all.tar.gz"
     2888    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"
    28882889    tar -cv tmp | gzip -9 > $MINDI_TMP/all.tar.gz || Die "Cannot make small all.tar.gz"
    28892890    sleep 2
  • branches/stable/mondo-doc/mondoarchive.8

    r948 r953  
    365365for its ISO's unless you exclude it, as follows:-
    366366.br
    367 .I "mondoarchive -Oi -d /mnt/foo -E \"/mnt/foo /mnt/foo2\" -p `hostname`-`date +%Y-%m-%d`"
     367.I "mondoarchive -Oi -d /mnt/foo -E '/mnt/foo /mnt/foo2' -p `hostname`-`date +%Y-%m-%d`"
    368368
    369369Backup to ISO's non-interactively, e.g. as a job running in /etc/cron.daily:
Note: See TracChangeset for help on using the changeset viewer.