Changeset 1547 in MondoRescue

Timestamp:

Jul 24, 2007, 1:20:40 AM (18 years ago)

Author:

Bruno Cornec

Message:

• Add the possibiilty to edit in interactive mode mtab and device.map for grub
• Remove blkid cache files after restore to avoid problems in cloning mode

Location:

branches/2.2.5/mondo/src/mondorestore

Files:

• mondo-restore.c (modified) (3 diffs)
• mondo-rstr-tools.c (modified) (3 diffs)

branches/2.2.5/mondo/src/mondorestore/mondo-restore.c

@@ -357 +357 @@
  *END_FIND_PATHNAME_OF_EXECUTABLE_PREFERABLY_IN_RESTORING                 *
  **************************************************************************/
+
+static void clean_blkid(struct s_bkpinfo *bkpinfo) {
+
+    char *tmp1 = NULL;
+
+    /* Clean up blkid cache file if they exist */
+    asprintf(&tmp1,"%s/etc/blkid.tab",bkpinfo->restore_path);
+    (void)unlink(tmp1);
+    paranoid_free(tmp1);
+    asprintf(&tmp1,"%s/etc/blkid.tab.old",bkpinfo->restore_path);
+    (void)unlink(tmp1);
+    paranoid_free(tmp1);
+}
 
 
@@ -599 +612 @@
     }
 
-//  run_program_and_log_output("cp -af /etc/lvm " MNT_RESTORING "/etc/", 1);
+    clean_blkid(bkpinfo);
     protect_against_braindead_sysadmins();
     //  modify_rclocal_one_time( MNT_RESTORING "/etc" );
@@ -838 +851 @@
         boot_loader_installed = TRUE;
     }
+    clean_blkid(bkpinfo);
     protect_against_braindead_sysadmins();
-//  run_program_and_log_output("cp -af /etc/lvm " MNT_RESTORING "/etc/", 1);
     //  modify_rclocal_one_time( MNT_RESTORING "/etc" );
     retval += unmount_all_devices(mountlist);

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

@@ -1679 +1679 @@
         mvaddstr_and_log_it(g_currentY,
                             0,
-                            "Modifying fstab and grub.conf, and running GRUB...                             ");
+                            "Modifying fstab, mtab, device.map and grub.conf, and running GRUB...                             ");
         for (done = FALSE; !done;) {
             popup_and_get_string("Boot device",
@@ -1696 +1696 @@
                 done = TRUE;
             }
-            popup_and_OK("You will now edit fstab and grub.conf");
+            popup_and_OK("You will now edit fstab, mtab, device.map and grub.conf");
             if (!g_text_mode) {
                 newtSuspend();
@@ -1702 +1702 @@
             sprintf(tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
             paranoid_system(tmp);
+            sprintf(tmp, "chroot %s %s /etc/mtab", MNT_RESTORING, editor);
+            paranoid_system(tmp);
             sprintf(tmp, "chroot %s %s /etc/grub.conf", MNT_RESTORING, editor);
+            paranoid_system(tmp);
+            sprintf(tmp, "chroot %s %s /boot/grub/device.map", MNT_RESTORING, editor);
             paranoid_system(tmp);
             if (!g_text_mode) {