Changeset 1924 in MondoRescue for branches/stable/mondo/src/common

Timestamp:

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

Author:

Bruno Cornec

Message:

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

Location:

branches/stable/mondo/src/common

Files:

• Makefile.am (modified) (2 diffs)
• libmondo-cli-EXT.h (copied) (copied from branches/2.2.6/mondo/src/common/libmondo-cli-EXT.h )
• libmondo-cli.c (copied) (copied from branches/2.2.6/mondo/src/common/libmondo-cli.c )
• libmondo-cli.h (copied) (copied from branches/2.2.6/mondo/src/common/libmondo-cli.h )
• libmondo-devices.c (modified) (2 diffs)
• libmondo-filelist.c (modified) (1 diff)
• libmondo-mountlist.c (modified) (3 diffs)
• libmondo-stream.c (modified) (1 diff)
• libmondo-tools.c (modified) (7 diffs)

branches/stable/mondo/src/common/Makefile.am

@@ -13 +13 @@
                        libmondo-mountlist.c libmondo-raid.c \
                        libmondo-stream.c libmondo-string.c libmondo-tools.c \
-                       libmondo-verify.c newt-specific.c \
+                       libmondo-verify.c newt-specific.c libmondo-cli.c \
                        libmondo-archive.h libmondo-devices.h \
                        libmondo-filelist.h libmondo-files.h libmondo-fork.h \
                        libmondo-gui.h libmondo-mountlist.h libmondo-raid.h \
                        libmondo-stream.h libmondo-string.h libmondo-tools.h \
-                       libmondo-verify.h libmondo-fifo.h \
+                       libmondo-verify.h libmondo-fifo.h libmondo-cli.h \
                        libmondo-archive-EXT.h my-stuff.h mondostructures.h \
                        libmondo-devices-EXT.h libmondo-fifo-EXT.h \
@@ -25 +25 @@
                        libmondo-mountlist-EXT.h libmondo-raid-EXT.h  \
                        libmondo-string-EXT.h libmondo-tools-EXT.h \
-                       libmondo-verify-EXT.h  libmondo-stream-EXT.h \
+                       libmondo-verify-EXT.h  libmondo-stream-EXT.h libmondo-cli-EXT.h \
                        newt-specific.h

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

@@ -61 +61 @@
  */
 bool g_restoring_live_from_cd = FALSE;
+bool g_restoring_live_from_nfs = FALSE;
 
 extern t_bkptype g_backup_media_type;   // set by main()
@@ -1852 +1853 @@
                 }
             } else {
-                sz_size = 0;
+                strcpy(sz_size, "0");
             }
             mr_free(comment);

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

@@ -1590 +1590 @@
         mr_asprintf(&tmp2, call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs|fat|vfat|dos' | awk '{print $3}'"));
         if (strlen(tmp2) < 1) {
-            mr_asprintf(&tmp1,"");
+            mr_asprintf(&tmp1," ");
         } else {
             mr_msg(2, "Found windows FS: %s",tmp2);

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

@@ -843 +843 @@
 #if linux
         sscanf(incoming,
-               "%s %s %s %s %s %s",
+               "%s %s %s %s %s",
                mountlist->el[items].device,
                mountlist->el[items].mountpoint,
@@ -909 +909 @@
                      mountlist->el[items].format,
                      mountlist->el[items].size,
-                    mountlist->el[items].label);
+                     mountlist->el[items].label);
             items++;
         }
@@ -948 +948 @@
     for (i = 0; i < mountlist->entries; i++) {
         fprintf(fout,
-                "%-15s %-15s %-15s %-15lld %-15s %-15s\n",
+                "%-15s %-15s %-15s %-15lld %-15s\n",
                 mountlist->el[i].device, mountlist->el[i].mountpoint,
                 mountlist->el[i].format, mountlist->el[i].size,

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

@@ -695 +695 @@
     (void) getcwd(old_cwd, MAX_STR_LEN);
     chdir(bkpinfo->tmpdir);
-    mr_asprintf(&tmp, "tar -zxf %s tmp/mondo-restore.cfg 2> /dev/null",
+    mr_asprintf(&tmp, "tar -zxf %s ./tmp/mondo-restore.cfg 2> /dev/null",
              outfname);
     paranoid_system(tmp);

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);