Changeset 1548 in MondoRescue for branches/stable/mondo/src/mondorestore

Timestamp:

Jul 24, 2007, 1:39:36 AM (17 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
• Fix what seems to appear a huge number of bugs in hack-fstab (illustration of 1 LOC = 1 bug :-)
• Especially improve LABEL and UUID support.
• Should fix #185
• Exclude_path should be 4*MAX_STR_LEN everywhere. Fixed now.
• Increasing that value will allow to having larger exclude paths.
• Should solve bug #137 (and maybe #3 as well)
• Adds support for fedora 7

(merge -r 1533:1547 $SVN_M/branches/2.2.5)

Location:

branches/stable/mondo/src/mondorestore

Files:

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

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

@@ -1410 +1410 @@
         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"),
@@ -1430 +1429 @@
                 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();
@@ -1438 +1437 @@
             mr_free(tmp);
 
+            mr_asprintf(&tmp, "chroot %s %s /etc/mtab", MNT_RESTORING, editor);
+            paranoid_system(tmp);
+            mr_free(tmp);
+
             mr_asprintf(&tmp, "chroot %s %s /etc/grub.conf", MNT_RESTORING, editor);
+            paranoid_system(tmp);
+            mr_free(tmp);
+
+            mr_asprintf(&tmp, "chroot %s %s /boot/grub/device.map", MNT_RESTORING, editor);
             paranoid_system(tmp);
             mr_free(tmp);

branches/stable/mondo/src/mondorestore/mondorestore.c

@@ -345 +345 @@
  *END_  EXTRACT_CONFIG_FILE_FROM_RAMDISK                                  *
  **************************************************************************/
+
+static void clean_blkid(struct s_bkpinfo *bkpinfo) {
+
+    char *tmp1 = NULL;
+
+    /* Clean up blkid cache file if they exist */
+    mr_asprintf(&tmp1,"%s/etc/blkid.tab",bkpinfo->restore_path);
+    (void)unlink(tmp1);
+    mr_free(tmp1);
+    mr_asprintf(&tmp1,"%s/etc/blkid.tab.old",bkpinfo->restore_path);
+    (void)unlink(tmp1);
+    mr_free(tmp1);
+}
 
 
@@ -586 +599 @@
     }
 
+    clean_blkid(bkpinfo);
     protect_against_braindead_sysadmins();
     retval += unmount_all_devices(mountlist);
@@ -839 +853 @@
         boot_loader_installed = TRUE;
     }
+    clean_blkid(bkpinfo);
     protect_against_braindead_sysadmins();
     retval += unmount_all_devices(mountlist);