Changeset 815 in MondoRescue for trunk/mondo

Timestamp:

Sep 23, 2006, 10:37:43 AM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r807:814 $SVN_M/branches/stable

Location:

trunk/mondo

Files:

• mondo/common/libmondo-archive.c (modified) (2 diffs)
• mondo/mondoarchive/main.c (modified) (4 diffs)
• mondo/mondoarchive/mondo-cli.c (modified) (1 diff)
• mondo/mondorestore/mondo-restore.c (modified) (1 diff)
• mondo_icon.png (copied) (copied from branches/stable/mondo/mondo_icon.png )

trunk/mondo/mondo/common/libmondo-archive.c

@@ -2025 +2025 @@
             delete_when_done = TRUE;
         } else {
-            // Call ntfsclone (formerly partimagehack) if it's a /dev entry (i.e. a partition to be imaged)
-            log_msg(2, "bigfile_fname = '%s'", bigfile_fname);
+            // Call ntfsclone (formerly partimagehack) if it's a /dev entry 
+            // (i.e. a partition to be imaged)
+            log_msg(2, "bigfile_fname = %s", bigfile_fname);
             use_ntfsprog = FALSE;
             if (!strncmp(bigfile_fname, "/dev/", 5)
@@ -2034 +2035 @@
                         "Calling ntfsclone in background because %s is an NTFS partition",
                         bigfile_fname);
-                asprintf(&sz_devfile, "/tmp/%d.%d.000",
+                asprintf(&sz_devfile, "%s/%d.%d.000",
+                        bkpinfo->tmpdir,
                          (int) (random() % 32768),
                          (int) (random() % 32768));

trunk/mondo/mondo/mondoarchive/main.c

@@ -123 +123 @@
 }
 
+/* Return a string containing the date */
+char *mr_date(void) {
+    
+    time_t tcurr;
+
+    tcurr = time(NULL);
+    return(ctime(&tcurr));
+}
+
+/*-----------------------------------------------------------*/
+
+
 
 /**
@@ -167 +179 @@
     /* Initialize Configuration Structure */
     mr_archive_init_conf(bkpinfo->mr_conf);
-    log_msg(0, "Start date : %s", get_time());
+
+    /* initialize log file with time stamp */
+    unlink(MONDO_LOGFILE);
+    log_msg(0, "Time started: %s", mr_date());
 
     /* make sure PATH environmental variable allows access to mkfs, fdisk, etc. */
@@ -179 +194 @@
     /* Add MONDO_SHARE environment variable for mindi */
     setenv_mondo_share();
-
-    unlink(MONDO_LOGFILE);
 
     /* Configure the bkpinfo structure, global file paths, etc. */
@@ -417 +430 @@
 
     run_program_and_log_output("date", 1);
-    log_msg(0, "End date : %s", get_time());
+
+    /* finalize log file with time stamp */
+    log_msg(0, "Time finished: %s", mr_date());
 
     if (!g_text_mode) {

trunk/mondo/mondo/mondoarchive/mondo-cli.c

@@ -515 +515 @@
                  * so handled here for the moment */
                 q--;
-                if (*q = '/') {
+                if (*q == '/') {
                     *q = '\0';
                 }

trunk/mondo/mondo/mondorestore/mondo-restore.c

@@ -1335 +1335 @@
                 "Calling ntfsclone in background because %s is a /dev entry",
                 outfile_fname);
-        asprintf(&ntfsprog_fifo, "/tmp/%d.%d.000", (int) (random() % 32768),
+        asprintf(&ntfsprog_fifo, "%s/%d.%d.000", 
+                bkpinfo->tmpdir,
+                (int) (random() % 32768),
                 (int) (random() % 32768));
         mkfifo(ntfsprog_fifo, 0x770);