Changeset 1695 in MondoRescue for branches

Timestamp:

Oct 21, 2007, 12:17:13 PM (18 years ago)

Author:

Bruno Cornec

Message:

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

Location:

branches/2.2.5

Files:

• mindi/mindi (modified) (1 diff)
• mondo/configure.in (modified) (1 diff)
• mondo/src/common/libmondo-archive.c (modified) (2 diffs)

branches/2.2.5/mindi/mindi

@@ -3366 +3366 @@
         Die "Cannot find all.tar.gz, to be written to tape"
     fi
-elif [ "$PROMPT_MAKE_USB_IMAGE" = "yes" ]; then
+elif [ "$PROMPT_MAKE_USB_IMAGE" = "yes" ] && [ "$USBDEVICE" != "" ]; then
     OfferToMakeBootableUSB $CACHE_LOC
 else

branches/2.2.5/mondo/configure.in

@@ -72 +72 @@
         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])
         PTHREAD="-lpthread"
-        CFLAGS="$CFLAGS -Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT"
+        CFLAGS="$CFLAGS -Wall -Wno-missing-noreturn -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT"
         ;;
     *)

branches/2.2.5/mondo/src/common/libmondo-archive.c

@@ -1086 +1086 @@
             }
         }
-        sprintf(command, "cp -f %s/mindi-*oot*.img %s/images",
+        /* For USB we already have everything on the key */
+        if (bkpinfo->backup_media_type == usb) {
+            sprintf(command, "rm -rf %s/images", bkpinfo->scratchdir);
+            system(tmp);
+        } else {
+            sprintf(command, "cp -f %s/mindi-*oot*.img %s/images",
                 bkpinfo->tmpdir, bkpinfo->scratchdir);
-        sprintf(tmp, "cp -f %s/images/all.tar.gz %s", bkpinfo->scratchdir,
+            sprintf(tmp, "cp -f %s/images/all.tar.gz %s", bkpinfo->scratchdir,
                 bkpinfo->tmpdir);
-        if (system(tmp)) {
-            fatal_error("Cannot find all.tar.gz in tmpdir");
+            if (system(tmp)) {
+                fatal_error("Cannot find all.tar.gz in tmpdir");
+            }
         }
         if (res) {
@@ -1907 +1913 @@
 
         /* Command to execute */
-        asprintf(&tmp,"mv %s/.??* %s/* %s", bkpinfo->scratchdir, bkpinfo->scratchdir, tmp1); 
+        asprintf(&tmp,"mv %s/* %s", bkpinfo->scratchdir, tmp1); 
         res = eval_call_to_make_USB(tmp, message_to_screen);
         if (res) {