Changeset 1663 in MondoRescue for branches/stable/mondo/src/common/libmondo-tools.c

Timestamp:

Sep 27, 2007, 12:21:18 PM (17 years ago)

Author:

Bruno Cornec

Message:

• Fix bug #197 (based on an initial patch of Scott Cummings)
• Fix a bug where df was using locale to print messages and wasn't filtered correctly
• mkdtemp checked in configure
• reset_bkpinfo called as early as possible by both main program.
• It creates a tmpdir cleanly with mkdtemp in setup_tmpdir subfunction, which takes in account TMPIR and TMP env var. Remains to see what tmpfs does and tests
• configure.in should also be filtered.
• Remove g_bkpinfo_DONTUSETHIS
• remove bkpinfo also from header files
• Render bkpinfo global (potential issue on thread, but should not be a problem as that structure is indeed static during archive)
• Apply patch from Andree Leidenfrost, modified a bit to use bkpinfo->tmpdir instead of /tmp or MINDI_CACHE when appropriate. Fix security issues in mondo. Thanks al ot Andree for catching all those issues.
• /tmp => /var/log for mondorestore.log in mindi
• Update linux terminfo to fix a color issue (Andree Leidenfrost)
• Removes useless log file (Andree Leidenfrost)
• replace vi with find_my_editor during restore (Andree Leidenfrost)
• sync in bg in mindi (VMWare issue to look at)
• mindi/mindi-busybox have a different version than mondo for pb
• PB-SUF also added to spec file
• Fix a bug for pb build (omission of PB-SUF declaration)

(merge -r1631:1662 $SVN_M/branches/2.2.5)

File:

• branches/stable/mondo/src/common/libmondo-tools.c (modified) (18 diffs)

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

@@ -23 +23 @@
 #include <sys/socket.h>
 #include <netdb.h>
+#include <stdlib.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -39 +40 @@
 
 extern struct mr_ar_conf *mr_conf;
+
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
 
 /**
@@ -347 +351 @@
  * do not exist.
  */
-int post_param_configuration(struct s_bkpinfo *bkpinfo)
+int post_param_configuration()
 {
     char *extra_cdrom_params = NULL;
@@ -383 +387 @@
     }
     make_hole_for_dir(bkpinfo->scratchdir);
-    make_hole_for_dir(bkpinfo->tmpdir);
     if (bkpinfo->backup_media_type == iso)
         make_hole_for_dir(bkpinfo->isodir);
@@ -620 +623 @@
             }
         }
-        store_nfs_config(bkpinfo);
+        store_nfs_config();
         mr_free(hostname);
     }
@@ -638 +641 @@
     }
     chmod(bkpinfo->scratchdir, 0700);
-    chmod(bkpinfo->tmpdir, 0700);
     g_backup_media_type = bkpinfo->backup_media_type;
     g_backup_media_string = bkpinfo->backup_media_string;
@@ -652 +654 @@
  * @return number of errors (0 for success)
  */
-int pre_param_configuration(struct s_bkpinfo *bkpinfo)
+int pre_param_configuration()
 {
     int res = 0;
+    char *tmp = NULL;
 
     make_hole_for_dir(MNT_CDROM);
@@ -660 +663 @@
     srandom((unsigned long) (time(NULL)));
     insmod_crucial_modules();
-    reset_bkpinfo(bkpinfo);     // also sets defaults ('/'=backup path, 3=compression level)
     if (bkpinfo->disaster_recovery) {
         if (!does_nonMS_partition_exist()) {
@@ -668 +670 @@
     }
 
-    run_program_and_log_output("rm -Rf /tmp/changed.files*", FALSE);
+    asprintf(&tmp,"rm -Rf %s/changed.files*",MINDI_CACHE);
+    run_program_and_log_output(tmp, FALSE);
+    paranoid_free(tmp);
     res += some_basic_system_sanity_checks();
     if (res) {
@@ -678 +682 @@
 }
 
-
+void setup_tmpdir(char *path) {
+    
+    char *tmp = NULL;
+    char *p = NULL;
+
+    if (bkpinfo->tmpdir != NULL) {
+        /* purging a potential old tmpdir */
+        asprintf(&tmp,"rm -Rf %s",bkpinfo->tmpdir);
+        system(tmp);
+        paranoid_free(tmp);
+    }
+        
+    if (path != NULL) {
+        asprintf(&tmp, "%s/mondo.tmp.XXXXXX", path);
+    } else if (getenv("TMPDIR")) {
+        asprintf(&tmp, "%s/mondo.tmp.XXXXXX", getenv("TMPDIR"));
+    } else if (getenv("TMP")) {
+        asprintf(&tmp, "%s/mondo.tmp.XXXXXX", getenv("TMP"));
+    } else {
+        asprintf(&tmp, "/tmp/mondo.tmp.XXXXXX");
+    }
+    p = mkdtemp(tmp);
+    if (p == NULL) {
+        log_it("Failed to create global tmp directory %s for Mondo.",tmp);
+        finish(-1);
+    }
+    strcpy(bkpinfo->tmpdir,p);
+    paranoid_free(tmp);
+
+    //sprintf(bkpinfo->tmpdir, "%s/tmpfs/mondo.tmp.%d", "/tmp", (int) (random() % 32768));  // for mondorestore
+}
 
 
@@ -685 +719 @@
  * @param bkpinfo The @c bkpinfo to reset.
  */
-void reset_bkpinfo(struct s_bkpinfo *bkpinfo)
+void reset_bkpinfo()
 {
     char *tmp = NULL;
@@ -694 +728 @@
     /* BERLIOS : Useless ?? */
     memset((void *) bkpinfo, 0, sizeof(struct s_bkpinfo));
+
+    /* special case for tmpdir as used eveywhere after */
+    setup_tmpdir(NULL);
 
     bkpinfo->manual_tray = mr_conf->manual_tray;
@@ -726 +763 @@
     bkpinfo->scratchdir[0] = '\0';
     bkpinfo->make_filelist = TRUE;  // unless -J supplied to mondoarchive
-    sprintf(bkpinfo->tmpdir, "/tmp/tmpfs/mondo.tmp.%d", (int) (random() % 32768));  // for mondorestore
     bkpinfo->optimal_set_size = 0;
     bkpinfo->backup_media_type = none;
@@ -952 +988 @@
         fatal_error("Please reinstall Mondo and Mindi.");
     }
-    if (run_program_and_log_output
-        ("mindi --makemountlist /tmp/mountlist.txt.test", 5)) {
+    mr_asprintf(&tmp, "mindi --makemountlist %s/mountlist.txt.test", bkpinfo->tmpdir);
+    if (run_program_and_log_output(tmp, 5)) {
+        log_to_screen(tmp);
         log_to_screen
-            (_("Mindi --makemountlist /tmp/mountlist.txt.test failed for some reason."));
+            (_("failed for some reason."));
         log_to_screen
             (_("Please run that command by hand and examine /var/log/mindi.log"));
@@ -964 +1001 @@
         retval++;
     }
+    mr_free(tmp);
 
     if (!run_program_and_log_output("parted2fdisk -l | grep -i raid", 1)
@@ -1156 +1194 @@
         return (1);
     }
-    mr_asprintf(&tempfile,
-           call_program_and_get_last_line_of_output
-           ("mktemp -q /tmp/mojo-jojo.blah.XXXXXX"));
+    mr_asprintf(&tempfile, "%s/mojo-jojo.blah", bkpinfo->tmpdir);
     if (does_file_exist(config_file)) {
         mr_asprintf(&command, "grep -vE '^%s .*$' %s > %s",
@@ -1185 +1221 @@
 {
     if (mal) {
-        iamhere("Malloc'ing globals");
         malloc_string(g_boot_mountpt);
         malloc_string(g_tmpfs_mountpt);
@@ -1192 +1227 @@
         malloc_string(g_magicdev_command);
     } else {
-        iamhere("Freeing globals");
         mr_free(g_boot_mountpt);
         mr_free(g_tmpfs_mountpt);