Changeset 3154 in MondoRescue for branches/3.0/mondo/src/common/libmondo-tools.c

Timestamp:

Jun 23, 2013, 12:34:33 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Remove the introduction of LogProgress in ListKernelModulePaths which should stay quiet
• Remove a remaining support of max-noof-media in confidure.in now gone.
• Fix #640 by cleaning up fully the managemnt of tmpdir and scratchdir (one function for the creation, one point of removal at end, intermediate removal if needed, clean naming conventions, unify mkdtemp usage, remove sensibly_set_tmpdir_and_scratchdir function). Consequence is that default dir for scratchdir if nothing else specified is /tmp using CLI and the largest partition using the GUI.
• Fix a bug introduced in process_the_s_switch with intermediate variables which weren't initialized correctly.

File:

• branches/3.0/mondo/src/common/libmondo-tools.c (modified) (4 diffs)

branches/3.0/mondo/src/common/libmondo-tools.c

@@ -409 +409 @@
         mr_free(tmp);
     }
-    make_hole_for_dir(bkpinfo->scratchdir);
     if (bkpinfo->backup_media_type == iso)
         make_hole_for_dir(bkpinfo->isodir);
@@ -744 +743 @@
     char *p = NULL;
 
-    if ((bkpinfo->tmpdir != NULL) && (strstr(bkpinfo->tmpdir,"mondo.tmp.") != NULL)) {
+    if (bkpinfo->tmpdir != NULL) {
         /* purging a potential old tmpdir */
-        log_it("Purging old tmpdir %s", bkpinfo->tmpdir);
         if (chdir("/tmp")) {
             // FIXME
         }
-        mr_asprintf(&tmp,"rm -Rf %s",bkpinfo->tmpdir);
+        if (strstr(bkpinfo->tmpdir,"mondo.tmp.") != NULL) {
+            log_it("Purging old tmpdir %s", bkpinfo->tmpdir);
+            mr_asprintf(&tmp,"rm -Rf %s",bkpinfo->tmpdir);
+        } else {
+            log_it("Purging old tmpdir %s/mondo.tmp.*", bkpinfo->tmpdir);
+            mr_asprintf(&tmp,"rm -Rf %s/mondo.tmp.*",bkpinfo->tmpdir);
+        }
         paranoid_system(tmp);
-        paranoid_free(tmp);
-    }
-
-    /* Always take in account env first */
-    if (getenv("TMPDIR")) {
+        mr_free(tmp);
+    }
+
+    /* Always take in account arg first, then env, then default */
+    if (path != NULL) {
+        mr_asprintf(&tmp, "%s/mondo.tmp.XXXXXX", path);
+    } else if (getenv("TMPDIR")) {
         mr_asprintf(&tmp, "%s/mondo.tmp.XXXXXX", getenv("TMPDIR"));
-    } else if (getenv("TMP")) {
-        mr_asprintf(&tmp, "%s/mondo.tmp.XXXXXX", getenv("TMP"));
-    } else if (path != NULL) {
-        mr_asprintf(&tmp, "%s/mondo.tmp.XXXXXX", path);
+    } else if (getenv("MRTMP")) {
+        mr_asprintf(&tmp, "%s/mondo.tmp.XXXXXX", getenv("MRTMP"));
     } else {
         mr_asprintf(&tmp, "/tmp/mondo.tmp.XXXXXX");
@@ -772 +776 @@
     strcpy(bkpinfo->tmpdir,p);
     paranoid_free(tmp);
+
+    mr_asprintf(&tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
+    paranoid_system(tmp);
+    mr_free(tmp);
+}
+
+void setup_scratchdir(char *path) {
+
+    char *tmp = NULL;
+    char *p = NULL;
+
+    if (bkpinfo->scratchdir != NULL) {
+        /* purging a potential old scratchdir */
+        if (chdir("/tmp")) {
+            // FIXME
+        }
+        if (strstr(bkpinfo->scratchdir,"mondo.scratch.") != NULL) {
+            log_it("Purging old scratchdir %s", bkpinfo->scratchdir);
+            mr_asprintf(&tmp,"rm -Rf %s",bkpinfo->scratchdir);
+        } else {
+            log_it("Purging old scratchdir %s/mondo.scratch.*", bkpinfo->scratchdir);
+            mr_asprintf(&tmp,"rm -Rf %s/mondo.scratch.*",bkpinfo->scratchdir);
+        }
+        paranoid_system(tmp);
+        mr_free(tmp);
+    }
+
+    /* Always take in account arg first, then env, then default */
+    if (path != NULL) {
+        mr_asprintf(&tmp, "%s/mondo.scratch.XXXXXX", path);
+    } else if (getenv("MRSCRATCH")) {
+        mr_asprintf(&tmp, "%s/mondo.scratch.XXXXXX", getenv("MRSCRATCH"));
+    } else {
+        mr_asprintf(&tmp, "/tmp/mondo.scratch.XXXXXX");
+    }
+    p = mkdtemp(tmp);
+    if (p == NULL) {
+        log_it("Failed to create global scratch directory %s for Mondo.",tmp);
+        finish(-1);
+    }
+    strcpy(bkpinfo->scratchdir,p);
+    paranoid_free(tmp);
+
+    mr_asprintf(&tmp, "mkdir -p %s", bkpinfo->scratchdir);
+    paranoid_system(tmp);
+    mr_free(tmp);
 }
 
@@ -811 +861 @@
     }
     strcpy(bkpinfo->prefix, STD_PREFIX);
-    sensibly_set_tmpdir_and_scratchdir();
+    setup_tmpdir(NULL);
+    setup_scratchdir(NULL);
 
     bkpinfo->optimal_set_size = 0;