Changeset 1696


Ignore:
Timestamp:
Oct 21, 2007, 1:07:54 PM (12 years ago)
Author:
bruno
Message:

Stil refining USB copy back to mondo (one command was not executed)

Location:
branches/2.2.5
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.5/mindi/mindi

    r1695 r1696  
    17671767            cp -f $j $k 2> /dev/null || Die "Failed to copy $j to $k"
    17681768            cp -f $j $MINDI_TMP 2> /dev/null || Die "Failed to copy $j to $MINDI_TMP"
    1769             if [ _"$MONDO_SHARE" != _"" ]; then
    1770                 cp -f $j $MONDO_ROOT 2>> $LOGFILE || Die "Failed to copy $j to $MONDO_ROOT"
    1771             fi
    17721769        fi
    17731770    done
     
    17881785    echo -en "."
    17891786    if [ "$ARCH" != "ia64" ] ; then
    1790         if [ _"$MONDO_SHARE" != _"" ]; then
    1791             cp -f $MONDO_SHARE/autorun $MONDO_ROOT 2>> $LOGFILE
    1792         fi
    17931787        umount $MINDI_TMP/usb
    17941788        syslinux $USBPART 2>> $MINDI_TMP/syslinux.log
     
    31373131        export MINDI_TMP=$MONDO_TMP
    31383132        mkdir -p $MINDI_TMP
    3139         # This is the scratch dir in mondo
     3133        # This is the scratch dir in mondo - subdir images
    31403134        CACHE_LOC=$3
    31413135        if [ _"$CACHE_LOC" != _"" ]; then
     
    32013195        fi
    32023196        [ "$CDRECOVERY" = "yes" ] && [ "$TAPEDEV" != "" ] && Die "Sorry, you can't use --cd-recovery and --write-tapes at the same time"
     3197        # MONDO_ROOT is the real scratchdir
    32033198        MONDO_ROOT=`echo $CACHE_LOC | sed 's/\(.*\)\/.*/\1/'`
    32043199        if [ _"$MONDO_ROOT" != _"" ]; then
  • branches/2.2.5/mondo/src/common/libmondo-archive.c

    r1695 r1696  
    10831083                    bkpinfo->tmpdir, bkpinfo->scratchdir);
    10841084            if (system(command)) {
    1085                 fatal_error("Unable to create temporary duff tarball");
     1085                fatal_error("Unable to create temporary all tarball");
    10861086            }
    10871087        }
     
    10891089        if (bkpinfo->backup_media_type == usb) {
    10901090            sprintf(command, "rm -rf %s/images", bkpinfo->scratchdir);
    1091             system(tmp);
     1091            run_program_and_log_output(command, FALSE);
    10921092        } else {
    10931093            sprintf(command, "cp -f %s/mindi-*oot*.img %s/images",
    10941094                bkpinfo->tmpdir, bkpinfo->scratchdir);
     1095            if (system(command)) {
     1096                log_msg(2, "Unable to copy mindi images");
     1097            }
    10951098            sprintf(tmp, "cp -f %s/images/all.tar.gz %s", bkpinfo->scratchdir,
    10961099                bkpinfo->tmpdir);
  • branches/2.2.5/pbconf/mondorescue.pb

    r1684 r1696  
    2828# Files are mentioned relatively to pbroot
    2929filteredfiles mondo = configure.in
    30 filteredfiles mondo-doc = mondorescue-howto.sgml,mondoarchive.8,mondorestore.8
     30filteredfiles mondo-doc = mondorescue-howto.sgml,mondoarchive.8,mondorestore.8,mindi.8
    3131filteredfiles mindi = rootfs/sbin/init,mindi,install.sh
    3232filteredfiles mondo-website = top.shtml
Note: See TracChangeset for help on using the changeset viewer.