Changeset 914 in MondoRescue for trunk/mondo/src/mondorestore

Timestamp:

Nov 2, 2006, 2:00:32 AM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r902:913 $SVN_M/branches/stable

Location:

trunk/mondo/src/mondorestore

Files:

• mondo-restore.c (modified) (2 diffs)
• mondo-rstr-tools-EXT.h (modified) (1 diff)
• mondo-rstr-tools.c (modified) (6 diffs)
• mondo-rstr-tools.h (modified) (1 diff)

trunk/mondo/src/mondorestore/mondo-restore.c

@@ -2046 +2046 @@
         mr_asprintf(&acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
         mr_asprintf(&xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
-        tmp = find_home_of_exe("setfacl");
-        if (length_of_file(acl_fname) > 0 && tmp) {
+        if (length_of_file(acl_fname) > 0) {
             set_acl_list(biggies_whose_EXATs_we_should_set, acl_fname);
         }
-        mr_free(tmp);
-
-        tmp = find_home_of_exe("setfattr");
-        if (length_of_file(xattr_fname) > 0 && tmp) {
+        if (length_of_file(xattr_fname) > 0) {
             set_fattr_list(biggies_whose_EXATs_we_should_set, xattr_fname);
         }
-        mr_free(tmp);
         mr_free(acl_fname);
         mr_free(xattr_fname);
@@ -2624 +2619 @@
 
 
+/**
+ * @brief Haha. You wish! (This function is not implemented :-)
+ */
+int
+restore_live_from_monitas_server(struct s_bkpinfo *bkpinfo,
+                                 char *monitas_device,
+                                 char *restore_this_directory,
+                                 char *restore_here)
+     /* NB: bkpinfo hasn't been populated yet, except for ->tmp which is "/tmp" */
+{
+    FILE *fout;
+    int retval = 0;
+    int i;
+    int j;
+    struct mountlist_itself the_mountlist;
+    static struct raidlist_itself the_raidlist;
+  /** malloc **/
+    char tmp[MAX_STR_LEN + 1];
+    char command[MAX_STR_LEN + 1];
+    char datablock[256 * 1024];
+    char datadisks_fname[MAX_STR_LEN + 1];
+    long k;
+    long length;
+    long long llt;
+    struct s_node *filelist = NULL;
+    assert(bkpinfo != NULL);
+    assert_string_is_neither_NULL_nor_zerolength(monitas_device);
+    assert(restore_this_directory != NULL);
+    assert(restore_here != NULL);
+
+    sprintf(tmp, "restore_here = '%s'", restore_here);
+
+    log_msg(2, tmp);
+
+    log_msg(2, "restore_live_from_monitas_server() - starting");
+    unlink("/tmp/mountlist.txt");
+    unlink("/tmp/filelist.full");
+    unlink("/tmp/biggielist.txt");
+    if (restore_here[0] == '\0') {
+        strcpy(bkpinfo->restore_path, MNT_RESTORING);
+    } else {
+        strcpy(bkpinfo->restore_path, restore_here);
+    }
+    log_msg(3, "FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI");
+    sprintf(tmp, "FYI - data will be restored to %s",
+            bkpinfo->restore_path);
+    log_msg(3, tmp);
+    log_msg(3, "FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI");
+    sprintf(datadisks_fname, "/tmp/mondorestore.datadisks.%d",
+            (int) (random() % 32768));
+    chdir(bkpinfo->tmpdir);
+
+    sprintf(command, "cat %s", monitas_device);
+    g_tape_stream = popen(command, "r");    // for compatibility with openin_tape()
+    if (!(fout = fopen(datadisks_fname, "w"))) {
+        log_OS_error(datadisks_fname);
+        return (1);
+    }
+    for (i = 0; i < 32; i++) {
+        for (j = 0; j < 4; j++) {
+            for (length = k = 0; length < 256 * 1024; length += k) {
+                k = fread(datablock + length, 1, 256 * 1024 - length,
+                          g_tape_stream);
+            }
+            fwrite(datablock, 1, length, fout);
+            g_tape_posK += length;
+        }
+    }
+    paranoid_fclose(fout);
+    sprintf(command,
+            "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);
+    read_header_block_from_stream(&llt, tmp, &i);
+    read_header_block_from_stream(&llt, tmp, &i);
+
+    unlink(datadisks_fname);
+    read_cfg_file_into_bkpinfo(g_mondo_cfg_file, bkpinfo);
+    retval = load_mountlist(&the_mountlist, g_mountlist_fname); // in case read_cfg_file_into_bkpinfo   strcpy(bkpinfo->media_device, monitas_device);
+
+
+    load_raidtab_into_raidlist(&the_raidlist, RAIDTAB_FNAME);
+    iamhere("FIXME");
+    fatal_error("This will fail");
+    sprintf(command,
+            "grep -E '^%s.*$' %s > %s",
+            restore_this_directory, g_filelist_full, g_filelist_full);
+    if (system(command)) {
+        retval++;
+        log_to_screen
+            ("Error(s) occurred while processing filelist and wildcard");
+    }
+    iamhere("FIXME");
+    fatal_error("This will fail");
+    sprintf(command,
+            "grep -E '^%s.*$' %s > %s",
+            restore_this_directory, g_biggielist_txt, g_biggielist_txt);
+    if (system(command)) {
+        log_msg(1,
+                "Error(s) occurred while processing biggielist and wildcard");
+    }
+    sprintf(command, "touch %s", g_biggielist_txt);
+    run_program_and_log_output(command, FALSE);
+//  filelist = load_filelist(g_filelist_restthese);  // FIXME --- this probably doesn't work because it doesn't include the biggiefiles
+    retval += restore_everything(bkpinfo, filelist);
+    free_filelist(filelist);
+    log_msg(2, "--------End of restore_live_from_monitas_server--------");
+    return (retval);
+}
+
+/**************************************************************************
+ *END_RESTORE_LIVE_FROM_MONITAS_SERVER                                    *
+ **************************************************************************/
+
+
+
+
+>>>>>>> .fusion-droit.r913
 extern void wait_until_software_raids_are_prepped(char *, int);
 

trunk/mondo/src/mondorestore/mondo-rstr-tools-EXT.h

@@ -9 +9 @@
 extern void kill_petris(void);
 extern int mount_cdrom(struct s_bkpinfo *bkpinfo);
-extern int mount_device(char *, char *, char *, bool);
 extern int mount_all_devices(struct mountlist_itself *, bool);
 extern void protect_against_braindead_sysadmins(void);

trunk/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -257 +257 @@
     mr_free(tmp);
 
-    mr_asprintf(&command, "grep -x \"%s\" %s", file, list_fname);
+    mr_asprintf(&command, "grep -E '^%s$' %s", file, list_fname);
     mr_free(file);
 
@@ -854 +854 @@
                 mr_allocstr(bkpinfo->prefix, STD_PREFIX);
             }
-            /* We need to override prefix value in PXE mode as it's 
-             * already done in start-nfs */
-            envtmp1 = getenv("imgname");
-            if (envtmp1 == NULL) {
-                fatal_error("no imgname variable in environment");
-            }
             if (strstr(call_program_and_get_last_line_of_output
                ("cat /proc/cmdline"), "pxe")) {
-                    mr_allocstr(bkpinfo->prefix,envtmp1);
+                /* We need to override prefix value in PXE mode as it's 
+                * already done in start-nfs */
+                envtmp1 = getenv("imgname");
+                if (envtmp1 == NULL) {
+                    fatal_error("no imgname variable in environment");
+                }
+                mr_allocstr(bkpinfo->prefix,envtmp1);
             }
 
@@ -989 +989 @@
             log_msg(2, "nfs_remote_dir is %s", bkpinfo->nfs_remote_dir);
         }
-        /* We need to override values in PXE mode as it's 
-         * already done in start-nfs */
-        envtmp1 = getenv("nfsmount");
-        if (envtmp1 == NULL) {
-            fatal_error("no nfsmount variable in environment");
-            }
-        envtmp2 = getenv("dirimg");
-        if (envtmp2 == NULL) {
-            fatal_error("no dirimg variable in environment");
-        }
         if (strstr(call_program_and_get_last_line_of_output
            ("cat /proc/cmdline"), "pxe")) {
-                mr_allocstr(bkpinfo->nfs_mount,envtmp1);
-                mr_allocstr(bkpinfo->nfs_remote_dir,envtmp2);
+            /* We need to override values in PXE mode as it's 
+            * already done in start-nfs */
+            envtmp1 = getenv("nfsmount");
+            if (envtmp1 == NULL) {
+                fatal_error("no nfsmount variable in environment");
+            }
+            envtmp2 = getenv("dirimg");
+            if (envtmp2 == NULL) {
+                fatal_error("no dirimg variable in environment");
+            }
+            mr_allocstr(bkpinfo->nfs_mount,envtmp1);
+            mr_allocstr(bkpinfo->nfs_remote_dir,envtmp2);
         }
     } else if (bkpinfo->backup_media_type == iso) {
@@ -1036 +1036 @@
                 /* Find out where it's mounted */
                 mr_asprintf(&command,
-                        "mount | grep -w %s | tail -n1 | cut -d' ' -f3",
+                        "mount | grep -E '^%s' | tail -n1 | cut -d' ' -f3",
                         g_isodir_device);
                 log_it("command = %s", command);
@@ -1238 +1238 @@
             mr_free(command);
         }
-        mr_asprintf(&command, "grep  -x \"/dev/.*\" %s > %s",
+        mr_asprintf(&command, "grep  -E '^/dev/.*$' %s > %s",
                 g_biggielist_txt, g_filelist_imagedevs);
         paranoid_system(command);
@@ -1368 +1368 @@
         mr_free(tmp);
     } else {
-        mr_asprintf(&tmp, "ls /dev | grep -xq %ss[1-4].*", device);
+        mr_asprintf(&tmp, "ls /dev | grep -Eq '^%ss[1-4].*$'", device);
         if (!system(tmp)) {
             mr_free(tmp);

trunk/mondo/src/mondorestore/mondo-rstr-tools.h

@@ -9 +9 @@
 void kill_petris(void);
 int mount_cdrom(struct s_bkpinfo *bkpinfo);
-int mount_device(char *, char *, char *, bool);
 int mount_all_devices(struct mountlist_itself *, bool);
 void protect_against_braindead_sysadmins(void);