Changeset 2049 in MondoRescue

Timestamp:

Oct 22, 2008, 7:50:04 PM (17 years ago)

Author:

Bruno Cornec

Message:

• Remove useless function extract_config_file_from_ramdisk()
• Avoid erasing mountlist and I-want-my-lvm when already existing (based on ideas from Benoit Donnette bdonnette_at_linagora.com)

Location:

branches/2.2.8/mondo/src

Files:

• common/libmondo-fifo.c (modified) (1 diff)
• mondorestore/mondo-rstr-tools-EXT.h (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (14 diffs)

branches/2.2.8/mondo/src/common/libmondo-fifo.c

@@ -194 +194 @@
 
 /* @} - end of fifoGroup */
-
-int
-extract_config_file_from_ramdisk(char *ramdisk_fname,
-                                 char *output_cfg_file,
-                                 char *output_mountlist_file);

branches/2.2.8/mondo/src/mondorestore/mondo-rstr-tools-EXT.h

@@ -29 +29 @@
 extern int unmount_all_devices(struct mountlist_itself *);
 extern int get_cfg_file_from_archive();
-extern int
-extract_config_file_from_ramdisk(
-                                 char *ramdisk_fname,
-                                 char *output_cfg_file,
-                                 char *output_mountlist_file);
-
 extern void ask_about_these_imagedevs(char *infname, char *outfname);
 

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

@@ -202 +202 @@
 * @ingroup restoreUtilityGroup
 */
-int
-extract_config_file_from_ramdisk(char *ramdisk_fname,
-                         char *output_cfg_file,
-                         char *output_mountlist_file)
-{
-char *mountpt;
-char *command;
-char *orig_fname;
-int retval = 0;
-
-assert(bkpinfo != NULL);
-malloc_string(mountpt);
-malloc_string(command);
-malloc_string(orig_fname);
-assert_string_is_neither_NULL_nor_zerolength(ramdisk_fname);
-assert_string_is_neither_NULL_nor_zerolength(output_cfg_file);
-assert_string_is_neither_NULL_nor_zerolength(output_mountlist_file);
-sprintf(mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir);
-sprintf(command, "mkdir -p %s", mountpt);
-run_program_and_log_output(command, FALSE);
-sprintf(command, "gzip -dc %s > %s/mindi.rd 2> /dev/null",
-    ramdisk_fname, bkpinfo->tmpdir);
-
-run_program_and_log_output(command, FALSE);
-sprintf(command, "umount %s", mountpt);
-
-run_program_and_log_output(command, FALSE);
-
-sprintf(command, "mount -o loop %s/mindi.rd -t ext2 %s",
-    bkpinfo->tmpdir, mountpt);
-
-run_program_and_log_output(command, FALSE);
-
-sprintf(command, "mkdir -p %s/tmp", bkpinfo->tmpdir);
-
-run_program_and_log_output(command, FALSE);
-
-sprintf(command, "cp -f %s/%s %s",  // %s/%s becomes {mountpt}/tmp/m*ndo-restore.cfg
-    mountpt, g_mondo_cfg_file, output_cfg_file);
-run_program_and_log_output(command, FALSE);
-
-sprintf(orig_fname, "%s/%s", mountpt, g_mountlist_fname);
-if (does_file_exist(orig_fname)) {
-sprintf(command, "cp -f %s %s", orig_fname, output_mountlist_file);
-run_program_and_log_output(command, FALSE);
-}
-sprintf(command, "umount %s", mountpt);
-run_program_and_log_output(command, FALSE);
-if (!does_file_exist(output_cfg_file)
-|| (!does_file_exist(output_mountlist_file)
-    && does_file_exist(orig_fname))) {
-log_msg(2, "Failed to extract %s and/or %s from ramdisk",
-        output_cfg_file, output_mountlist_file);
-retval = 1;
-} else {
-retval = 0;
-}
-paranoid_free(mountpt);
-paranoid_free(command);
-paranoid_free(orig_fname);
-return (retval);
-
-}
-
-
-
 
 /**
@@ -1186 +1120 @@
 int res = 0;
 pid_t pid;
+bool extract_mountlist_stub = FALSE;
 
 assert(bkpinfo != NULL);
 malloc_string(command);
 malloc_string(tmp);
+
+/* If those files already exist, do not overwrite them later on */
+if (does_file_exist("/"MOUNTLIST_FNAME_STUB)) {
+    extract_mountlist_stub = FALSE;
+} else {
+    extract_mountlist_stub = TRUE;
+}
 
 if (does_file_exist(g_filelist_full)
@@ -1204 +1146 @@
     unlink("/tmp/filelist.full");
     unlink(FILELIST_FULL_STUB);
-    unlink("/" IWANTMYLVM_STUB);
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         sprintf(command,
@@ -1213 +1154 @@
             BIGGIELIST_TXT_STUB,
             FILELIST_FULL_STUB,
-            IWANTMYLVM_STUB, 
+            IWANTMYLVM_STUB,
             MONDO_CFG_FILE_STUB);
         log_msg(1, "tarcommand = %s", command);
@@ -1228 +1169 @@
                 FILELIST_FULL_STUB,
                 IWANTMYLVM_STUB,
-                MONDO_CFG_FILE_STUB);
+                MONDO_CFG_FILE_STUB);
             log_msg(1, "tarcommand = %s", command);
             run_program_and_log_output(command, 1);
@@ -1245 +1186 @@
             BIGGIELIST_TXT_STUB,
             FILELIST_FULL_STUB,
-            IWANTMYLVM_STUB, 
+            IWANTMYLVM_STUB,
             MONDO_CFG_FILE_STUB);
 
@@ -1259 +1200 @@
                 BIGGIELIST_TXT_STUB,
                 FILELIST_FULL_STUB,
-                IWANTMYLVM_STUB, 
+                IWANTMYLVM_STUB,
                 MONDO_CFG_FILE_STUB);
 
@@ -1290 +1231 @@
     if (am_I_in_disaster_recovery_mode()
     &&
+    /* If it was there, do not overwrite it */
+    (extract_mountlist_stub) 
+    &&
     ask_me_yes_or_no("Do you want to retrieve the mountlist as well?"))
     {
@@ -1298 +1242 @@
 
     chdir(tmp);
-    
+
     if (!does_file_exist(g_biggielist_txt)) {
         log_msg(1, "Warning - %s not found", g_biggielist_txt);
@@ -2231 +2175 @@
     char *ramdisk_fname;
     char *mountlist_file;
+    bool extract_mountlist_stub;
+    bool extract_i_want_my_lvm;
 
     bool try_plan_B;
@@ -2252 +2198 @@
     unlink(FILELIST_FULL_STUB);
     unlink(BIGGIELIST_TXT_STUB);
-    unlink(IWANTMYLVM_STUB);
     sprintf(command, "mkdir -p %s", mountpt);
     run_program_and_log_output(command, FALSE);
 
-//   unlink( "tmp/mondo-restore.cfg" ); // superfluous, surely?
-
     sprintf(cfg_file, "%s/%s", bkpinfo->tmpdir, MONDO_CFG_FILE_STUB);
-    sprintf(mountlist_file, "%s/%s", bkpinfo->tmpdir,
-            MOUNTLIST_FNAME_STUB);
+    sprintf(mountlist_file, "%s/%s", bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
     //   make_hole_for_file( cfg_file );
     //   make_hole_for_file( mountlist_file);
@@ -2316 +2258 @@
             }
         } else {
+                if (does_file_exist("/"MOUNTLIST_FNAME_STUB)) {
+                    extract_mountlist_stub = FALSE;
+                } else {
+                    extract_mountlist_stub = TRUE;
+                }
+                if (does_file_exist("/"IWANTMYLVM_STUB)) {
+                    extract_i_want_my_lvm = FALSE;
+                } else {
+                    extract_i_want_my_lvm = TRUE;
+                }
+
                 log_msg(2,
                         "gcffa --- Plan B, a.k.a. untarring some file from all.tar.gz");
@@ -2348 +2301 @@
         }
         sprintf(command, "cp -f %s/%s %s",
-                call_program_and_get_last_line_of_output("pwd"),
-                MOUNTLIST_FNAME_STUB, mountlist_file);
+            call_program_and_get_last_line_of_output("pwd"),
+            MOUNTLIST_FNAME_STUB, mountlist_file);
         iamhere(command);
-        if (strcmp(tmp, cfg_file)
-            && run_program_and_log_output(command, 1)) {
-            log_msg(1, "Failed to get mountlist");
-        } else {
-            log_msg(1, "Got mountlist too");
-            sprintf(command, "cp -f %s %s", mountlist_file,
-                    g_mountlist_fname);
-            if (run_program_and_log_output(command, 1)) {
-                log_msg(1, "Failed to copy mountlist to /tmp");
+        if (extract_mountlist_stub) {
+            if (strcmp(tmp, cfg_file)
+                && run_program_and_log_output(command, 1)) {
+                log_msg(1, "Failed to get mountlist");
             } else {
-                log_msg(1, "Copied mountlist to /tmp as well OK");
-                sprintf(command, "cp -f %s /tmp/",IWANTMYLVM_STUB);
-                run_program_and_log_output(command, 1);
+                log_msg(1, "Got mountlist too");
+                sprintf(command, "cp -f %s %s", mountlist_file,
+                        g_mountlist_fname);
+                if (run_program_and_log_output(command, 1)) {
+                    log_msg(1, "Failed to copy mountlist to /tmp");
+                } else {
+                    log_msg(1, "Copied mountlist to /tmp as well OK");
+                    sprintf(command, "cp -f %s /tmp/",IWANTMYLVM_STUB);
+                    run_program_and_log_output(command, 1);
+                }
             }
         }
@@ -2380 +2335 @@
         log_to_screen("...but not mountlist.txt - a pity, really...");
     }
-/* start SAH */
     else {
-        sprintf(command, "cp -f %s %s/%s", MOUNTLIST_FNAME_STUB,
-                bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
-        run_program_and_log_output(command, FALSE);
-    }
-/*--commented out by SAH
-  sprintf( command, "cp -f %s %s/%s", cfg_file, bkpinfo->tmpdir, MONDO_CFG_FILE_STUB );
-  run_program_and_log_output( command, FALSE );
-  sprintf( command, "cp -f %s %s/%s", mountlist_file, bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB );
-  run_program_and_log_output( command, FALSE );
-*/
-/* end SAH */
+            /* Is this code really useful ??? */
+        if (extract_mountlist_stub) {
+            sprintf(command, "cp -f %s %s/%s", MOUNTLIST_FNAME_STUB,
+                    bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
+            run_program_and_log_output(command, FALSE);
+        }
+    }
 
     sprintf(command, "cp -f %s /%s", cfg_file, MONDO_CFG_FILE_STUB);
     run_program_and_log_output(command, FALSE);
-    sprintf(command, "cp -f %s /%s", mountlist_file, MOUNTLIST_FNAME_STUB);
-    run_program_and_log_output(command, FALSE);
+    if (extract_mountlist_stub) {
+        sprintf(command, "cp -f %s /%s", mountlist_file, MOUNTLIST_FNAME_STUB);
+        run_program_and_log_output(command, FALSE);
+    }
     sprintf(command, "cp -f etc/raidtab /etc/");
     run_program_and_log_output(command, FALSE);
-    sprintf(command, "cp -f %s /tmp/",IWANTMYLVM_STUB);
-    run_program_and_log_output(command, FALSE);
+    if (extract_i_want_my_lvm) {
+        sprintf(command, "cp -f %s /tmp/",IWANTMYLVM_STUB);
+        run_program_and_log_output(command, FALSE);
+    }
     g_backup_media_type = bkpinfo->backup_media_type;
     paranoid_free(device);