Changeset 2072 in MondoRescue for branches/2.2.8/mondo

Timestamp:

Dec 5, 2008, 3:32:59 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Adds multipath support (as exists on RHEL 5.2)
  • analyze-my-lvm/mindi uses the /dev/mapper/mpath... entry and not /dev/dm-... entry which is not automatically created at restore time
  • Lots of mapth dmsetup commands added to deplist
  • Adds required modules to mindi
  • Fix a bug for this in mindi around real devices with /dev/mapper/mpath... names
  • init has a new StartMpath function to start multipath correctly hopefully
  • mondorestore has a new clean_multiconf function which removes /var/lib/multipath/bindings and edits /etc/multipath.conf if needed

File:

• branches/2.2.8/mondo/src/mondorestore/mondorestore.c (modified) (3 diffs)

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

@@ -366 +366 @@
     asprintf(&tmp1,"%s/etc/blkid.tab.old",bkpinfo->restore_path);
     (void)unlink(tmp1);
+    paranoid_free(tmp1);
+}
+
+
+static void clean_multiconf() {
+
+    char *tmp1 = NULL;
+
+    /* Clean up multiconf cache file if they exist */
+    asprintf(&tmp1,"%s/var/lib/multipath/bindings",bkpinfo->restore_path);
+    (void)unlink(tmp1);
+    paranoid_free(tmp1);
+
+    /* Edit multipath.conf if needed to adapt wwid */
+    asprintf(&tmp1,"%s/etc/multipath.conf", MNT_RESTORING);
+    if (does_file_exist(tmp1)) {
+        log_msg(2, "We may need to clean /etc/multipath.conf");
+    } else {
+        paranoid_free(tmp1);
+        return();
+    }
+    paranoid_free(tmp1);
+    asprintf(&tmp1,"chroot %s %s /etc/multipath.conf", MNT_RESTORING, editor);
+    paranoid_system(tmp1);
     paranoid_free(tmp1);
 }
@@ -612 +636 @@
 
     clean_blkid();
+    clean_multiconf();
     protect_against_braindead_sysadmins();
     retval += unmount_all_devices(mountlist);
@@ -845 +870 @@
     }
     clean_blkid();
+    clean_multiconf();
     protect_against_braindead_sysadmins();
     retval += unmount_all_devices(mountlist);