Changeset 1695


Ignore:
Timestamp:
Oct 21, 2007, 12:17:13 PM (12 years ago)
Author:
bruno
Message:

No need to have the image subdor in the csratchdir when USB.

Location:
branches/2.2.5
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.5/mindi/mindi

    r1694 r1695  
    33663366        Die "Cannot find all.tar.gz, to be written to tape"
    33673367    fi
    3368 elif [ "$PROMPT_MAKE_USB_IMAGE" = "yes" ]; then
     3368elif [ "$PROMPT_MAKE_USB_IMAGE" = "yes" ] && [ "$USBDEVICE" != "" ]; then
    33693369    OfferToMakeBootableUSB $CACHE_LOC
    33703370else
  • branches/2.2.5/mondo/configure.in

    r1654 r1695  
    7272        AC_CHECK_LIB(pthread, pthread_create, true, [echo "*** Cannot find -lpthread."; echo "*** Please make sure you have the linuxthreads glibc add-on installed."; exit 1])
    7373        PTHREAD="-lpthread"
    74         CFLAGS="$CFLAGS -Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT"
     74        CFLAGS="$CFLAGS -Wall -Wno-missing-noreturn -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT"
    7575        ;;
    7676    *)
  • branches/2.2.5/mondo/src/common/libmondo-archive.c

    r1691 r1695  
    10861086            }
    10871087        }
    1088         sprintf(command, "cp -f %s/mindi-*oot*.img %s/images",
     1088        /* For USB we already have everything on the key */
     1089        if (bkpinfo->backup_media_type == usb) {
     1090            sprintf(command, "rm -rf %s/images", bkpinfo->scratchdir);
     1091            system(tmp);
     1092        } else {
     1093            sprintf(command, "cp -f %s/mindi-*oot*.img %s/images",
    10891094                bkpinfo->tmpdir, bkpinfo->scratchdir);
    1090         sprintf(tmp, "cp -f %s/images/all.tar.gz %s", bkpinfo->scratchdir,
     1095            sprintf(tmp, "cp -f %s/images/all.tar.gz %s", bkpinfo->scratchdir,
    10911096                bkpinfo->tmpdir);
    1092         if (system(tmp)) {
    1093             fatal_error("Cannot find all.tar.gz in tmpdir");
     1097            if (system(tmp)) {
     1098                fatal_error("Cannot find all.tar.gz in tmpdir");
     1099            }
    10941100        }
    10951101        if (res) {
     
    19071913
    19081914        /* Command to execute */
    1909         asprintf(&tmp,"mv %s/.??* %s/* %s", bkpinfo->scratchdir, bkpinfo->scratchdir, tmp1);
     1915        asprintf(&tmp,"mv %s/* %s", bkpinfo->scratchdir, tmp1);
    19101916        res = eval_call_to_make_USB(tmp, message_to_screen);
    19111917        if (res) {
Note: See TracChangeset for help on using the changeset viewer.