Changeset 2105 in MondoRescue

Timestamp:

Jan 6, 2009, 5:42:58 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Improve function truncate_to_drive_name to support returning full drives used as partitions (such as /dev/mapper/mapthx)

Location:

branches/2.2.8

Files:

• mindi/mindi (modified) (1 diff)
• mondo/src/common/libmondo-string.c (modified) (2 diffs)

branches/2.2.8/mindi/mindi

@@ -57 +57 @@
 CDROM_MODS="$TAPE_MODS $IDE_MODS $USB_MODS $PCMCIA_MODS $SCSI_MODS $NET_MODS af_packet cdrom isocd isofs inflate_fs nls_iso8859-1 nls_base nls_cp437 nls_utf8 sg sr_mod zlib_inflate iso9660"
 # Those modules will only go on the backup media, not the boot media.
-EXTRA_MODS="$CDROM_MODS vfat fat loop md-mod linear raid0 raid1 xor raid5 raid456 lvm-mod dm-mod dm_mod dm-snapshot dm_snapshot dm-zero dm_zero dm-mirror dm_mirror dm-multipath dm-round-robin jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd mbcache ext4 jbd2 crc16"
+EXTRA_MODS="$CDROM_MODS vfat fat loop md-mod linear raid0 raid1 xor raid5 raid456 lvm-mod dm-mod dm_mod dm-snapshot dm_snapshot dm-zero dm_zero dm-mirror dm_mirror dm-multipath dm-round-robin jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd mbcache ext4 jbd2 crc16 fuse"
 # Replace with that line for HP OCMP e.g.
 #DENY_MODS="MPS_Driver_Mapper mps octtldrv tscttl streams kqemu fdomain"

branches/2.2.8/mondo/src/common/libmondo-string.c

@@ -863 +863 @@
     }
     /* then see if it's a dm style device */
-    if (c && strncmp(c, "/dm-", 5) == 0) {
+    if (c && strncmp(c, "/dm-", 4) == 0) {
         /* yup it's dm, return the full path */
         return partition;
     }
+
 
     for (i = strlen(partition); isdigit(partition[i - 1]); i--)
@@ -872 +873 @@
     if (partition[i - 1] == 'p' && isdigit(partition[i - 2])) {
         i--;
+    } else {
+        /* Some full devices like this /dev/mapper/mpath0
+        * /dev/cciss/c0d0 may be used as partition names */
+        if ((strstr(partition,"/dev/mapper/mpath") != NULL) ||
+            (strstr(partition,"/dev/cciss/c") != NULL) ||
+            (strstr(partition,"/dev/rd/") != NULL)) {
+                return partition;
+            }
     }
     partition[i] = '\0';