Changeset 2094 in MondoRescue

Timestamp:

Dec 17, 2008, 12:59:22 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Adds support for initrd regeneration at restore time.

Location:

branches/2.2.8/mondo/src/mondorestore

Files:

• mondo-rstr-newt.c (modified) (1 diff)
• mondo-rstr-tools.c (modified) (7 diffs)
• mondorestore.c (modified) (6 diffs)

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

@@ -1 +1 @@
 /***************************************************************************
-mondo-rstr-newt.c  -  description
------------------
-
-begin: Fri Apr 19 16:40:35 EDT 2002
-copyright : (C) 2002 Mondo  Hugo Rabson
-email     : Hugo Rabson <hugorabson@msn.com>
-edited by : by Stan Benoit 4/2002
-email     : troff@nakedsoul.org
-cvsid     : $Id$
-***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-/* mondo-rstr-newt.c               Hugo Rabson
-
-
-07/12
-- wider mountlist entry editor window
-
-03/28/2004
-- removed g_mountlist_fname
-
-07/02/2003
-- fixed calls to popup_and_get_string()
-
-06/05
-- cleaned up get_isodir_info()
-
-05/02
-- added strip_path() to improve file list display for long paths (Conor)
-
-04/24
-- added lots of assert()'s and log_OS_error()'s
-
-04/08/2003
-- commented out call to sort_mountlist_by_device(), just in case it's 
-  futzing with LVM/RAID users
-
-08/21/2002
-- fix MOUNTLIST_FNAME and RAIDTAB_FNAME if Reload button finds them empty
-
-08/19
-- fixed what_number_cd_is_this() to take bkpinfo as parameter
-
-07/01 - 07/31
-- renamed from mondo-newt.c to mondo-rstr-newt.c
-- moved lots of subroutines to libmondo-newt.c
-- added hooks to libmondo
-- better handling of yes/no/YES/NO
-- better "% done" feedback (Philippe de Muyter)
-
-05/01 - 06/30
-- trim trailing \n from fgets() in a couple of functions
-- expanded "May I write mountlist?" message
-- replace scanf() with a properly restricted fgets() (Troff)
-
-02/01 - 02/28/2002
-- allow up to 50 chars in popup_and_get_string()'s input field
-- if g_current_progress > g_maximum_progress then g_current_progress=g_max...
-  to stop the progress bar from shooting off the RHS of the screen :)
-- beefed up the RAID-related logging a bit
-- don't complain if partition format is a number (1-255)
-- if hard disk does not exist then warn user when editing mountlist
-- when running 'eject -t', log its output
-
-[...]
-
-08/09/2001
-- created
-*/
+ * $Id$
+ */
 
 

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

@@ -1348 +1348 @@
 }
 
+void offer_to_make_initrd() {
+
+if (bkpinfo->restore_mode != nuke) {
+    if (!ask_me_yes_or_no
+        ("You will now be able to re-generate your initrd.\nThis specially useful if you changed of hardware configuration, cloned, made P2V, used multipath... Do you need to do it ?")) {
+        return;
+    }
+    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.");
+    newtSuspend();
+    (void)system("chroot " MNT_RESTORING);
+    newtResume();
+} else {
+    log_to_screen("Non-interactive mode: no way to give you the keyboard so that you re-generate your initrd. Hope it's OK");
+    log_msg(1,"Non-interactive mode: no way to give you the keyboard so that you re-generate your initrd. Hope it's OK");
+}
+}
+
 
 /**
@@ -1389 +1406 @@
     paranoid_free(tmp);
     system("sync");
+
+    offer_to_make_initrd();
     if (!strcmp(name, "LILO")) {
         res = run_lilo(offer_to_hack_scripts);
@@ -1506 +1525 @@
     }
     if (offer_to_run_stabgrub
-        && ask_me_yes_or_no("Did you change the mountlist?"))
+        && ask_me_yes_or_no("Did you change the mountlist or cloned the system ?"))
         /* interactive mode */
     {
@@ -1613 +1632 @@
     strcpy(editor, find_my_editor());
     if (offer_to_run_stabelilo
-        && ask_me_yes_or_no("Did you change the mountlist?"))
+        && ask_me_yes_or_no("Did you change the mountlist or cloned the system ?"))
 
         /* interactive mode */
@@ -1687 +1706 @@
     strcpy(editor, find_my_editor());
     if (offer_to_run_stablilo
-        && ask_me_yes_or_no("Did you change the mountlist?"))
+        && ask_me_yes_or_no("Did you change the mountlist or cloned the system ?"))
 
         /* interactive mode */
@@ -1800 +1819 @@
 
     if (offer_to_hack_scripts
-        && ask_me_yes_or_no("Did you change the mountlist?"))
+        && ask_me_yes_or_no("Did you change the mountlist or cloned the system ?"))
         /* interactive mode */
     {
@@ -2429 +2448 @@
     paranoid_free(raidlist);
 }
+
+

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

@@ -391 +391 @@
     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);
@@ -630 +634 @@
     }
 
+    clean_multiconf();
     if (ask_me_yes_or_no("Initialize the boot loader?")) {
         run_boot_loader(TRUE);
@@ -639 +644 @@
 
     clean_blkid();
-    clean_multiconf();
     protect_against_braindead_sysadmins();
     retval += unmount_all_devices(mountlist);
@@ -867 +871 @@
     iamhere("Restoring everything");
     retval += restore_everything(NULL);
+    clean_multiconf();
     if (!run_boot_loader(FALSE)) {
         log_msg(1,
@@ -873 +878 @@
     }
     clean_blkid();
-    clean_multiconf();
     protect_against_braindead_sysadmins();
     retval += unmount_all_devices(mountlist);
@@ -2818 +2822 @@
     bool run_postnuke = FALSE;
 
-  /**************************************************************************
-   * hugo-                                                                  *
-   * busy stuff here - it needs some comments -stan                           *
-   *                                                                        *
-   **************************************************************************/
     if (getuid() != 0) {
         fprintf(stderr, "Please run as root.\r\n");