Changeset 2136 in MondoRescue for branches/2.2.8

Timestamp:

Feb 2, 2009, 1:09:01 PM (16 years ago)

Author:

Bruno Cornec

Message:

Fix a bug with Newt where a newtResume was missing after multipath.conf edit

Location:

branches/2.2.8/mondo/src

Files:

• common/newt-specific.c (modified) (6 diffs)
• mondorestore/mondo-rstr-tools.c (modified) (1 diff)
• mondorestore/mondorestore.c (modified) (4 diffs)

branches/2.2.8/mondo/src/common/newt-specific.c

@@ -121 +121 @@
 
         /*@ buffers ********************************************************** */
-        char *tmp;
         int i;
 
-         tmp = malloc(MAX_NEWT_COMMENT_LEN);
          assert_string_is_neither_NULL_nor_zerolength(prompt);
 
         if (g_text_mode) {
+
+            char *tmp;
+            tmp = malloc(MAX_NEWT_COMMENT_LEN);
+
             while (1) {
                 system("sync");
@@ -154 +156 @@
             }
         } else {
-            paranoid_free(tmp);
             return (popup_with_buttons(prompt, "Yes", "No"));
         }
@@ -798 +799 @@
 
         /*@ buffers *********************************************************** */
-        char *prompt, *tmp;
+        char *prompt;
 
         /*@ newt ************************************************************** */
@@ -807 +808 @@
         newtComponent text;
 
-        prompt = malloc(MAX_NEWT_COMMENT_LEN);
-        tmp = malloc(MAX_NEWT_COMMENT_LEN);
         assert_string_is_neither_NULL_nor_zerolength(p);
         assert(button1 != NULL);
         assert(button2 != NULL);
+        prompt = malloc(MAX_NEWT_COMMENT_LEN);
         if (g_text_mode) {
             if (strlen(button2) == 0) {
@@ -818 +818 @@
                 printf("%s (%s or %s) --> ", p, button1, button2);
             }
-            for (tmp[0] = '\0';
-                 strcmp(tmp, button1) && (strlen(button2) == 0
-                                          || strcmp(tmp, button2));) {
+            for (prompt[0] = '\0';
+                 strcmp(prompt, button1) && (strlen(button2) == 0
+                                          || strcmp(prompt, button2));) {
                 printf("--> ");
-                (void) fgets(tmp, MAX_NEWT_COMMENT_LEN, stdin);
-            }
-            if (!strcmp(tmp, button1)) {
-                paranoid_free(tmp);
+                (void) fgets(prompt, MAX_NEWT_COMMENT_LEN, stdin);
+            }
+            if (!strcmp(prompt, button1)) {
                 paranoid_free(prompt);
                 return (TRUE);
             } else {
-                paranoid_free(tmp);
                 paranoid_free(prompt);
                 return (FALSE);
@@ -861 +859 @@
         newtPopWindow();
         if (b_res == b_1) {
-            paranoid_free(tmp);
             paranoid_free(prompt);
             return (TRUE);
         } else {
-            paranoid_free(tmp);
             paranoid_free(prompt);
             return (FALSE);

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

@@ -1361 +1361 @@
     if (ask_me_yes_or_no
         ("You will now be able to re-generate your initrd.\nThis is especially useful if you changed of hardware configuration, cloned, made P2V, used multipath...\nDo you need to do it ?")) {
+        log_msg(1,"Launching shell for manual initrd recreation");
+        popup_and_OK("You'll now be chrooted under your future / partition.\nGo under /boot and rebuild your initrd with\nmkinitrd -f -v initrd-2.x.y.img 2.x.y e.g.\nThen type exit to finish.");
         mvaddstr_and_log_it(g_currentY, 0, "Modifying initrd...");
-        popup_and_OK("You'll now be chrooted under your future / partition.\nGo under /boot and rebuild your initrd with\nmkinitrd -f -v initrd-2.x.y.img 2.x.y e.g.\nThen type exit to finish.");
         if (!g_text_mode) {
             newtSuspend();

branches/2.2.8/mondo/src/mondorestore/mondorestore.c

@@ -370 +370 @@
 
 
-static void clean_multiconf() {
+static void clean_multipathconf() {
 
     char *tmp1 = NULL;
@@ -389 +389 @@
     }
     paranoid_free(tmp1);
-    asprintf(&editor, "%s", find_my_editor());
-    asprintf(&tmp1,"chroot %s %s /etc/multipath.conf", MNT_RESTORING, editor);
-    popup_and_OK("You will now edit multipath.conf");
-    if (!g_text_mode) {
-        newtSuspend();
-    }
-    paranoid_system(tmp1);
-    paranoid_free(tmp1);
-    paranoid_free(editor);
+
+    if (bkpinfo->restore_mode != nuke) {
+        asprintf(&editor, "%s", find_my_editor());
+        asprintf(&tmp1,"chroot %s %s /etc/multipath.conf", MNT_RESTORING, editor);
+        popup_and_OK("You will now edit multipath.conf");
+        if (!g_text_mode) {
+            newtSuspend();
+        }
+        paranoid_system(tmp1);
+        if (!g_text_mode) {
+            newtResume();
+        }
+        paranoid_free(tmp1);
+        paranoid_free(editor);
+    } else {
+        log_to_screen("Non-interactive mode: no way to give you the keyboard so that you edit your multipath.conf. Hope it's OK");
+        log_msg(1,"Non-interactive mode: no way to give you the keyboard so that you edit your multipath.conf. Hope it's OK");
+    }
 }
 
@@ -634 +643 @@
     }
 
-    clean_multiconf();
+    clean_multipathconf();
     if (ask_me_yes_or_no("Initialize the boot loader?")) {
         run_boot_loader(TRUE);
@@ -871 +880 @@
     iamhere("Restoring everything");
     retval += restore_everything(NULL);
-    clean_multiconf();
+    clean_multipathconf();
     if (!run_boot_loader(FALSE)) {
         log_msg(1,