Changeset 818 in MondoRescue

Timestamp:

Sep 23, 2006, 11:10:46 AM (18 years ago)

Author:

andree

Message:

Enhance the way we deal with post-nuke:

• ask whether post-nuke should be executed if it exists even if we are not in nuke mode;
• log the fact that no post-nuke script was found during restore;
• perform after nuke steps even if we dropped back to interacive mode because of issue with mount list;
• ask user after nuke to wait until s/he is returned to command prompt before rebooting;
• use run_program_and_log_output() instead of system() to get output of post-nuke logged;
• output screen messages about post-nuke.

File:

• branches/stable/mondo/mondo/mondorestore/mondo-restore.c (modified) (4 diffs)

branches/stable/mondo/mondo/mondorestore/mondo-restore.c

@@ -1119 +1119 @@
         if (ask_me_yes_or_no(tmp)) {
             retval = interactive_mode(bkpinfo, mountlist, raidlist);
-            finish(retval);
+            goto after_the_nuke;
         } else {
             fatal_error("Nuke Mode aborted. ");
@@ -1227 +1227 @@
             ("Please visit our website at http://www.mondorescue.org for more information.");
     } else {
-        strcpy(tmp," Mondo has restored your system. Please remove the backup media and reboot.\n\nPlease visit our website at http://www.mondorescue.org for more information.");
+        strcpy(tmp,"Mondo has restored your system.\n\nPlease wait for the command prompt. Then remove the backup media and reboot.\n\nPlease visit our website at http://www.mondorescue.org for more information.");
         if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "restore") == NULL) {
             popup_and_OK(tmp);
         }
         log_to_screen
-            ("Mondo has restored your system. Please remove the backup media and reboot.");
+          ("Mondo has restored your system. Please wait for the command prompt.");
+        log_to_screen
+            ("Then remove the backup media and reboot.");
         log_to_screen
             ("Please visit our website at http://www.mondorescue.org for more information.");
@@ -3198 +3200 @@
     struct s_node *filelist;
     char *a, *b;
+    bool run_postnuke = FALSE;
 
   /**************************************************************************
@@ -3606 +3609 @@
 
 // g_I_have_just_nuked is set true by nuke_mode() just before it returns
-    if (g_I_have_just_nuked || does_file_exist("/POST-NUKE-ANYWAY")) {
-        if (!system("which post-nuke > /dev/null 2> /dev/null")) {
-            log_msg(1, "post-nuke found; running...");
-            if (mount_all_devices(mountlist, TRUE)) {
-                log_to_screen
-                    ("Unable to re-mount partitions for post-nuke stuff");
-            } else {
-                log_msg(1, "Re-mounted partitions for post-nuke stuff");
-                sprintf(tmp, "post-nuke %s %d", bkpinfo->restore_path,
-                        retval);
-                if (!g_text_mode) {
-                    newtSuspend();
-                }
-                log_msg(2, "Calling '%s'", tmp);
-                if ((res = system(tmp))) {
-                    log_OS_error(tmp);
-                }
-                if (!g_text_mode) {
-                    newtResume();
-                }
-//              newtCls();
-                log_msg(1, "post-nuke returned w/ res=%d", res);
-            }
-            unmount_all_devices(mountlist);
-            log_msg(1, "I've finished post-nuking.");
-        }
-    }
+    if (!system("which post-nuke > /dev/null 2> /dev/null")) {
+      log_msg(1, "post-nuke found; find out whether we should run it...");
+      if (g_I_have_just_nuked || does_file_exist("/POST-NUKE-ANYWAY")) {
+        run_postnuke = TRUE;
+        log_msg(1, "Yes, will run post-nuke because in nuke mode or file /POST-NUKE-ANYWAY exists.");
+      } else if (ask_me_yes_or_no("post-nuke script found. Do you want to run it?")) {
+        run_postnuke = TRUE;
+        log_msg(1, "Yes, will run post-nuke because user interactively asked for it.");
+      } else {
+        run_postnuke = FALSE;
+        log_msg(1, "No, will not run post-nuke.");
+      }
+    } else {
+      log_msg(1, "No post-nuke found.");
+    }
+    if (run_postnuke) {
+      log_to_screen("Running post-nuke...");
+      if (mount_all_devices(mountlist, TRUE)) {
+        log_to_screen
+          ("Unable to re-mount partitions for post-nuke stuff");
+      } else {
+        log_msg(1, "Re-mounted partitions for post-nuke stuff");
+        sprintf(tmp, "post-nuke %s %d", bkpinfo->restore_path,
+            retval);
+        log_msg(2, "Calling '%s'", tmp);
+        if ((res = run_program_and_log_output(tmp, 0))) {
+          log_OS_error(tmp);
+        }
+        log_msg(1, "post-nuke returned w/ res=%d", res);
+      }
+      unmount_all_devices(mountlist);
+      log_to_screen("I've finished post-nuking.");
+    }
+
 /*  
   log_to_screen("If you are REALLY in a hurry, hit Ctrl-Alt-Del now.");