Changeset 1987 in MondoRescue

Timestamp:

Jun 20, 2008, 4:08:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Fix #260 restoring when cancel in non disaster mode was a regression on 2.2.5

Location:

branches/2.2.7/mondo/src/mondorestore

Files:

• mondo-rstr-tools.c (modified) (3 diffs)
• mondorestore.c (modified) (1 diff)

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

@@ -1279 +1279 @@
 if (does_file_exist(g_filelist_full)
 && does_file_exist(g_biggielist_txt)) {
-log_msg(1, "%s exists", g_filelist_full);
-log_msg(1, "%s exists", g_biggielist_txt);
-log_msg(2,
+    log_msg(1, "%s exists", g_filelist_full);
+    log_msg(1, "%s exists", g_biggielist_txt);
+    log_msg(2,
         "Filelist and biggielist already recovered from media. Yay!");
 } else {
-getcwd(tmp, MAX_STR_LEN);
-chdir(bkpinfo->tmpdir);
-log_msg(1, "chdir(%s)", bkpinfo->tmpdir);
-log_to_screen("Extracting filelist and biggielist from media...");
-unlink("/tmp/filelist.full");
-unlink("/" FILELIST_FULL_STUB);
-unlink("/tmp/i-want-my-lvm");
-if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-    sprintf(command,
+    getcwd(tmp, MAX_STR_LEN);
+    chdir(bkpinfo->tmpdir);
+    log_msg(1, "chdir(%s)", bkpinfo->tmpdir);
+    log_to_screen("Extracting filelist and biggielist from media...");
+    unlink("/tmp/filelist.full");
+    unlink("/" FILELIST_FULL_STUB);
+    unlink("/tmp/i-want-my-lvm");
+    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
+        sprintf(command,
             "tar -b %ld -zxf %s %s %s %s %s %s",
             bkpinfo->internal_tape_block_size,
@@ -1300 +1300 @@
             FILELIST_FULL_STUB,
             "./tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);
-    log_msg(1, "tarcommand = %s", command);
-    run_program_and_log_output(command, 1);
-} else {
-    log_msg(2,
+        log_msg(1, "tarcommand = %s", command);
+        run_program_and_log_output(command, 1);
+    } else {
+        log_msg(2,
             "Calling insist_on_this_cd_number; bkpinfo->isodir=%s",
             bkpinfo->isodir);
-    insist_on_this_cd_number(1);
-    log_msg(2, "Back from iotcn");
-    run_program_and_log_output("mount", 1);
-    sprintf(command,
+        insist_on_this_cd_number(1);
+        log_msg(2, "Back from iotcn");
+        run_program_and_log_output("mount", 1);
+        sprintf(command,
             "tar -zxf %s/images/all.tar.gz %s %s %s %s %s",
             MNT_CDROM,
@@ -1317 +1317 @@
             "./tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);
 
-    log_msg(1, "tarcommand = %s", command);
-    run_program_and_log_output(command, 1);
-//    popup_and_OK("Press ENTER to continue");
-    if (!does_file_exist(BIGGIELIST_TXT_STUB)) {
-        fatal_error
-            ("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");
-    }
-}
-sprintf(command, "cp -f %s %s", MONDO_CFG_FILE_STUB,
+        log_msg(1, "tarcommand = %s", command);
+        run_program_and_log_output(command, 1);
+        if (!does_file_exist(BIGGIELIST_TXT_STUB)) {
+            fatal_error
+                ("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");
+        }
+    }
+    sprintf(command, "cp -f %s %s", MONDO_CFG_FILE_STUB,
         g_mondo_cfg_file);
-run_program_and_log_output(command, FALSE);
-
-sprintf(command, "cp -f %s/%s %s", bkpinfo->tmpdir,
+    run_program_and_log_output(command, FALSE);
+
+    sprintf(command, "cp -f %s/%s %s", bkpinfo->tmpdir,
         BIGGIELIST_TXT_STUB, g_biggielist_txt);
-log_msg(1, "command = %s", command);
-paranoid_system(command);
-sprintf(command, "ln -sf %s/%s %s", bkpinfo->tmpdir,
+    log_msg(1, "command = %s", command);
+    paranoid_system(command);
+    sprintf(command, "ln -sf %s/%s %s", bkpinfo->tmpdir,
         FILELIST_FULL_STUB, g_filelist_full);
-log_msg(1, "command = %s", command);
-paranoid_system(command);
-}
-
-if (am_I_in_disaster_recovery_mode()
-&&
-ask_me_yes_or_no("Do you want to retrieve the mountlist as well?"))
-{
+    log_msg(1, "command = %s", command);
+    paranoid_system(command);
+    }
+
+    if (am_I_in_disaster_recovery_mode()
+    &&
+    ask_me_yes_or_no("Do you want to retrieve the mountlist as well?"))
+    {
 //      sprintf(command, "cp -f tmp/mountlist.txt /tmp");
-sprintf(command, "ln -sf %s/%s /tmp", MOUNTLIST_FNAME_STUB,
-        bkpinfo->tmpdir);
-paranoid_system(command);
-}
-
-chdir(tmp);
-
-if (!does_file_exist(g_biggielist_txt)) {
-log_msg(1, "Warning - %s not found", g_biggielist_txt);
-}
-if (!does_file_exist(g_filelist_full)) {
-log_msg(1, "Warning - %s does not exist", g_filelist_full);
-}
+        sprintf(command, "ln -sf %s/%s /tmp", MOUNTLIST_FNAME_STUB,
+            bkpinfo->tmpdir);
+    paranoid_system(command);
+    }
+
+    chdir(tmp);
+    
+    if (!does_file_exist(g_biggielist_txt)) {
+        log_msg(1, "Warning - %s not found", g_biggielist_txt);
+    }
+    if (!does_file_exist(g_filelist_full)) {
+        log_msg(1, "Warning - %s does not exist", g_filelist_full);
+    }
 //  popup_and_OK("Wonderful.");
 
-log_msg(2, "Forking");
-pid = fork();
-switch (pid) {
-case -1:
-fatal_error("Forking error");
-break;
-
-case 0:
-log_to_screen("Pre-processing filelist");
-if (!does_file_exist(g_biggielist_txt)) {
+    log_msg(2, "Forking");
+    pid = fork();
+    switch (pid) {
+    case -1:
+        fatal_error("Forking error");
+        break;
+
+    case 0:
+        log_to_screen("Pre-processing filelist");
+        if (!does_file_exist(g_biggielist_txt)) {
             sprintf(command, "echo -n > %s", g_biggielist_txt);
             paranoid_system(command);

branches/2.2.7/mondo/src/mondorestore/mondorestore.c

@@ -964 +964 @@
         strcpy(bkpinfo->restore_path, old_restpath);
     } else {
-        retval += restore_everything(NULL);
+        if (filelist != NULL) {
+            retval += restore_everything(NULL);
+        }
     }
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {