Changeset 1924 in MondoRescue for branches/stable/mondo

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

Files:

• common/Makefile.am (modified) (2 diffs)
• common/libmondo-cli-EXT.h (copied) (copied from branches/2.2.6/mondo/src/common/libmondo-cli-EXT.h )
• common/libmondo-cli.c (copied) (copied from branches/2.2.6/mondo/src/common/libmondo-cli.c )
• common/libmondo-cli.h (copied) (copied from branches/2.2.6/mondo/src/common/libmondo-cli.h )
• common/libmondo-devices.c (modified) (2 diffs)
• common/libmondo-filelist.c (modified) (1 diff)
• common/libmondo-mountlist.c (modified) (3 diffs)
• common/libmondo-stream.c (modified) (1 diff)
• common/libmondo-tools.c (modified) (7 diffs)
• include/my-stuff.h (modified) (2 diffs)
• lib/mr_str.c (modified) (1 diff)
• mondoarchive/Makefile.am (modified) (1 diff)
• mondoarchive/mondo-cli-EXT.h (deleted)
• mondoarchive/mondo-cli.c (deleted)
• mondoarchive/mondo-cli.h (deleted)
• mondoarchive/mondoarchive.c (modified) (1 diff)
• mondoarchive/mondoarchive.h (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (6 diffs)
• mondorestore/mondorestore.c (modified) (5 diffs)
• mondorestore/mr-externs.h (modified) (1 diff)

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

branches/stable/mondo/src/include/my-stuff.h

@@ -18 +18 @@
 #define MINDI_CACHE "/var/cache/mindi"
 #define MONDORESTORECFG MONDO_CACHE"/mondo-restore.cfg"
+
 /**
  * The mondo-restore.cfg stub (appended to the directory where all.tar.gz was unpacked).
  */
-#define MONDO_CFG_FILE_STUB "tmp/mondo-restore.cfg"
-
-
+#define MONDO_CFG_FILE_STUB "./tmp/mondo-restore.cfg"
 
 /**
@@ -76 +75 @@
  * The biggielist stub (appended to the directory where all.tar.gz was unpacked).
  */
-#define BIGGIELIST_TXT_STUB "tmp/biggielist.txt"
+#define BIGGIELIST_TXT_STUB "./tmp/biggielist.txt"
 
 /**
  * The filelist stub (appended to the directory where all.tar.gz was unpacked).
  */
-#define FILELIST_FULL_STUB "tmp/filelist.full.gz"
+#define FILELIST_FULL_STUB "./tmp/filelist.full.gz"
 
 /**
  * The mountlist stub (appended to the directory where all.tar.gz was unpacked).
  */
-#define MOUNTLIST_FNAME_STUB "tmp/mountlist.txt"
+#define MOUNTLIST_FNAME_STUB "./tmp/mountlist.txt"
+
+/**
+ * The mondo-restore.cfg stub (appended to the directory where all.tar.gz was unpacked).
+ */
+#define MONDO_CFG_FILE_STUB "./tmp/mondo-restore.cfg"
 
 /**

branches/stable/mondo/src/lib/mr_str.c

@@ -6 +6 @@
  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

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

@@ -7 +7 @@
 
 ## Headers
-noinst_HEADERS       = mondo-cli-EXT.h mondo-cli.h mondoarchive.h
+noinst_HEADERS       = mondoarchive.h
 
 ## The program
 sbin_PROGRAMS        = mondoarchive
-mondoarchive_SOURCES = mondoarchive.c mondo-cli.c
+mondoarchive_SOURCES = mondoarchive.c
 mondoarchive_LDADD   = ${top_builddir}/src/common/libmondo.a ${top_builddir}/src/lib/libmr.a

branches/stable/mondo/src/mondoarchive/mondoarchive.c

@@ -59 +59 @@
 
 /****************** subroutines used only here ******************/
+
+/**
+ * Whether we're restoring from ISOs. Obviously not, since this is the
+ * backup program.
+ * @note You @b MUST declare this variable somewhere in your program if
+ * you use libmondo. Otherwise the link will fail.
+ * @ingroup globalGroup
+ */
+bool g_ISO_restore_mode = FALSE;
+
+/* Do we use extended attributes and acl ?
+ *  * By default no, use --acl & --attr options to force their usage */
+char *g_getfacl = NULL;
+char *g_getfattr = NULL;
 
 /* Reference to global bkpinfo */

branches/stable/mondo/src/mondoarchive/mondoarchive.h

@@ -17 +17 @@
  */
 char *MONDO_LOGFILE = "/var/log/mondoarchive.log";
+char *MONDO_OPTIONS = "0123456789A:B:C:DE:FGHI:J:K:LNOP:QRS:T:UVWb:c:d:ef:gik:l:mn:op:rs:tuw:x:z";
 
 /* No restriction on ps options */

branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -1118 +1118 @@
                     BIGGIELIST_TXT_STUB,
                     FILELIST_FULL_STUB,
-                    "tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);
+                    "./tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);
             mr_msg(1, "tarcommand = %s", command);
             run_program_and_log_output(command, 1);
@@ -1135 +1135 @@
                     BIGGIELIST_TXT_STUB,
                     FILELIST_FULL_STUB,
-                    "tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);
+                    "./tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);
             mr_msg(1, "tarcommand = %s", command);
             run_program_and_log_output(command, 1);
@@ -1142 +1142 @@
             if (!does_file_exist(BIGGIELIST_TXT_STUB)) {
                 fatal_error
-                    ("all.tar.gz did not include tmp/biggielist.txt");
+                    ("all.tar.gz did not include ./tmp/biggielist.txt");
             }
             if (!does_file_exist(FILELIST_FULL_STUB)) {
                 fatal_error
-                    ("all.tar.gz did not include tmp/filelist.full.gz");
+                    ("all.tar.gz did not include ./tmp/filelist.full.gz");
             }
         }
@@ -2083 +2083 @@
             1024L * 1024 * 32 / bkpinfo->internal_tape_block_size,
             MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB,
-            BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "tmp/i-want-my-lvm");
+            BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "./tmp/i-want-my-lvm");
     mr_msg(2, "command = '%s'", command);
     res = run_program_and_log_output(command, -1);
@@ -2113 +2113 @@
     char *ramdisk_fname = NULL;
     char *mountlist_file = NULL;
-    int res = 0;
 
     bool try_plan_B = FALSE;
@@ -2205 +2204 @@
                 mr_msg(2,
                         "gcffa --- Plan B, a.k.a. untarring some file from all.tar.gz");
-                mr_asprintf(&command, "tar -zxvf " MNT_CDROM "/images/all.tar.gz %s %s %s %s %s", MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "tmp/i-want-my-lvm"); // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
+                mr_asprintf(&command, "tar -zxvf " MNT_CDROM "/images/all.tar.gz %s %s %s %s %s", MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "./tmp/i-want-my-lvm");   // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
                 run_program_and_log_output(command, TRUE);
                 mr_free(command);

branches/stable/mondo/src/mondorestore/mondorestore.c

@@ -924 +924 @@
 
     strcpy(bkpinfo->restore_path, "/");
-    if (!g_restoring_live_from_cd) {
+    if (!g_restoring_live_from_cd && !g_restoring_live_from_nfs) {
         popup_and_OK
             (_("Please insert tape/CD/USB key, then hit 'OK' to continue."));
         sleep(1);
     }
-    interactively_obtain_media_parameters_from_user(FALSE);
+    if (!g_restoring_live_from_nfs) {
+        interactively_obtain_media_parameters_from_user(FALSE);
+    }
     if (!bkpinfo->media_device) {
         mr_msg(2, "Warning - failed to find media dev");
@@ -948 +950 @@
     retval = load_mountlist(mountlist, g_mountlist_fname);
     load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
-    filelist = process_filelist_and_biggielist();
-    if (filelist) {
+
+    if (!g_restoring_live_from_nfs && (filelist = process_filelist_and_biggielist())) {
         save_filelist(filelist, "/tmp/selected-files.txt");
         mr_asprintf(&old_restpath,bkpinfo->restore_path);
@@ -961 +963 @@
         strcpy(bkpinfo->restore_path, old_restpath);
         mr_free(old_restpath);
+    } else {
+        retval += restore_everything(NULL);
     }
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
@@ -2706 +2710 @@
     paranoid_fclose(fout);
     sprintf(command,
-            "tar -zxvf %s tmp/mondo-restore.cfg tmp/mountlist.txt tmp/filelist.full tmp/biggielist.txt",
+            "tar -zxvf %s ./tmp/mondo-restore.cfg ./tmp/mountlist.txt ./tmp/filelist.full ./tmp/biggielist.txt",
             datadisks_fname);
     run_program_and_log_output(command, 4);
@@ -3044 +3048 @@
             g_restoring_live_from_cd = TRUE;
         }
+        if (bkpinfo->backup_media_type == nfs) {
+            g_restoring_live_from_nfs = TRUE;
+        }
         if (argc == 5 && strcmp(argv[1], "--monitas-live") == 0) {
             retval =

branches/stable/mondo/src/mondorestore/mr-externs.h

@@ -108 +108 @@
 extern bool g_text_mode;
 extern bool g_restoring_live_from_cd;
+extern bool g_restoring_live_from_nfs;
 extern int fput_string_one_char_at_a_time(FILE *, char *);