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

Timestamp:

Apr 18, 2008, 1:41:41 AM (16 years ago)

Author:

Bruno Cornec

Message:

svn merge -r 1902:1923 $SVN_M/branches/2.2.6

File:

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

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

@@ -21 +21 @@
 #include "libmondo-fork-EXT.h"
 #include "libmondo-raid-EXT.h"
+#include "libmondo-devices-EXT.h"
 #include <sys/socket.h>
 #include <netdb.h>
@@ -78 +79 @@
 
 extern bool am_I_in_disaster_recovery_mode(void);
+
+/* Return a string containing the date */
+char *mr_date(void) {
+
+        time_t tcurr;
+
+        tcurr = time(NULL);
+        return(ctime(&tcurr));
+}
+
+/*-----------------------------------------------------------*/
 
 
@@ -692 +704 @@
     strcpy(bkpinfo->tmpdir,p);
     paranoid_free(tmp);
-
-    //sprintf(bkpinfo->tmpdir, "%s/tmpfs/mondo.tmp.%d", "/tmp", (int) (random() % 32768));  // for mondorestore
 }
 
@@ -711 +721 @@
     memset((void *) bkpinfo, 0, sizeof(struct s_bkpinfo));
 
-    /* special case for tmpdir as used eveywhere after */
-    setup_tmpdir(NULL);
+    sensibly_set_tmpdir_and_scratchdir();
 
     bkpinfo->manual_tray = mr_conf->manual_tray;
@@ -764 +773 @@
     bkpinfo->prefix = tmp;
 
-    bkpinfo->scratchdir[0] = '\0';
     bkpinfo->make_filelist = TRUE;  // unless -J supplied to mondoarchive
     bkpinfo->optimal_set_size = 0;
@@ -823 +831 @@
  * - make sure afio, cdrecord, bzip2, awk, md5sum, strings, mindi, and buffer exist
  * - make sure CD-ROM is unmounted
- * - make sure /etc/modules.conf exists
  * - make sure user's mountlist is OK by running <tt>mindi --makemountlist</tt>
  *
@@ -940 +947 @@
     }
     mr_free(tmp);
-#ifndef __FreeBSD__
-    if (!does_file_exist("/etc/modules.conf")) {
-        if (does_file_exist("/etc/conf.modules")) {
-            log_it("Linking /etc/modules.conf to /etc/conf.modules");
-            run_program_and_log_output
-                ("ln -sf /etc/conf.modules /etc/modules.conf", 5);
-        } else if (does_file_exist("/etc/modprobe.d")) {
-            log_it
-                ("Directory /etc/modprobe.d found. mindi will use its contents.");
-        } else if (does_file_exist("/etc/modprobe.conf")) {
-            log_it("Linking /etc/modules.conf to /etc/modprobe.conf");
-            run_program_and_log_output
-                ("ln -sf /etc/modprobe.conf /etc/modules.conf", 5);
-        } else {
-            retval++;
-            log_to_screen
-                (_("Please find out what happened to /etc/modules.conf"));
-        }
-    }
-#endif
 
     run_program_and_log_output("cat /etc/fstab", 5);