Changeset 2052 in MondoRescue

Timestamp:

Oct 23, 2008, 2:55:59 PM (15 years ago)

Author:

Bruno Cornec

Message:

Adds support for dm devices in truncate_to_drive_name

Location:

branches/2.2.8

Files:

• mindi/mindi (modified) (1 diff)
• mondo/src/common/libmondo-devices.c (modified) (2 diffs)
• mondo/src/common/libmondo-mountlist.c (modified) (2 diffs)
• mondo/src/common/libmondo-string.c (modified) (1 diff)
• mondo/src/mondorestore/mondo-prep.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-multipath dm-round-robin dm_round_robin jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd mbcache"
+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_multipath dm-round-robin dm_round_robin jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd mbcache"
 # Replace with that line for HP OCMP e.g.
 #DENY_MODS="MPS_Driver_Mapper mps octtldrv tscttl streams kqemu"

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

@@ -1017 +1017 @@
             log_msg(1, "Failed to get harddisk geometry, using old mode");
         }
-/*  
-  if ((fd = open (drive, O_RDONLY)) != -1) {
-      if (ioctl (fd, HDIO_GETGEO, &hdgeo) != -1)  {
-      close (fd);
-      log_msg (2, "Geometry of drive %s is C:%d, H:%d, S%d, its size is %d MB", drive, hdgeo.cylinders, hdgeo.heads, hdgeo.sectors, (hdgeo.cylinders * hdgeo.heads * hdgeo.sectors / 2 / 1024));
-      if ( hdgeo.cylinders && hdgeo.heads && hdgeo.sectors ) {
-          outvalB = ((long) (hdgeo.cylinders * hdgeo.heads * hdgeo.sectors / 2 / 1024));
-      }
-      }
-      close (fd);
- */
 #endif
     }
@@ -1042 +1031 @@
     return (outvalC);
 }
-
-/* The old version */
-#if 0
-long get_phys_size_of_drive(char *drive)
-{
-    /*@ pointers **************************************************** */
-#if linux
-    FILE *fin;
-    char *p;
-    char *q;
-    char *r;
-    /*@ buffers ***************************************************** */
-    char *tmp;
-    char *command;
-
-    /*@ long ******************************************************** */
-    long outL;
-    long tempLa;
-    long tempLb;
-    long tempLc;
-
-#endif
-
-    struct hd_geometry hdgeo;
-    int fd;
-
-#ifdef __FreeBSD__
-    off_t o;
-
-    if ((fd = open(drive, O_RDONLY)) != -1) {
-        if (ioctl(fd, DIOCGMEDIASIZE, &o) != -1) {
-            close(fd);
-            return (long) (o / (off_t) (1024 * 1024));
-        }
-        close(fd);
-    }
-    log_msg(4, "drive = %s, error = %s", drive, strerror(errno));
-    fatal_error("GPSOD: Unable to get size of drive");
-#else
-
-    malloc_string(tmp);
-    malloc_string(command);
-
-    if ((fd = open(drive, O_RDONLY)) != -1) {
-        if (ioctl(fd, HDIO_GETGEO, &hdgeo) != -1) {
-            close(fd);
-            log_msg(2,
-                    "Geometry of drive %s is C:%d, H:%d, S%d, its size is %d MB",
-                    drive, hdgeo.cylinders, hdgeo.heads, hdgeo.sectors,
-                    (hdgeo.cylinders * hdgeo.heads * hdgeo.sectors / 2 /
-                     1024));
-            if (hdgeo.cylinders && hdgeo.heads && hdgeo.sectors) {
-                return ((long)
-                        (hdgeo.cylinders * hdgeo.heads * hdgeo.sectors /
-                         2 / 1024));
-            }
-        }
-        close(fd);
-    }
-
-    assert_string_is_neither_NULL_nor_zerolength(drive);
-
-    sprintf(command,
-            "parted2fdisk -l %s | head -n4 | tr -s '\n' '\t' | tr -s ' ' '\t' | cut -f8,14,16",
-            drive);
-    strcpy(tmp, call_program_and_get_last_line_of_output(command));
-    if (tmp[0]) {
-        p = tmp;
-        q = strchr(p, ' ');
-        if (q) {
-            *(q++) = '\0';
-            r = strchr(q, ' ');
-            if (r) {
-                *(r++) = '\0';
-                tempLa = atol(p);
-                tempLb = atol(q);
-                tempLc = atol(r);
-                outL = tempLa * tempLb / 1024 * tempLc / 1024;
-                if (outL > 100) {
-                    paranoid_free(tmp);
-                    paranoid_free(command);
-                    return (outL);
-                }
-            }
-        }
-    }
-
-    /* try to grep for 'Drive xxxx: yyy MB' */
-    sprintf(command,
-            "parted2fdisk -l %s | grep MB | tr -s ' ' '\t' | cut -f3",
-            drive);
-    strcpy(tmp, call_program_and_get_last_line_of_output(command));
-    if (atol(tmp) > 0) {
-        paranoid_free(tmp);
-        paranoid_free(command);
-        return (atol(tmp));
-    }
-
-    /* else, do it the old-fashioned way */
-    p = strrchr(drive, (int) '/');
-    if (p) {
-        strcpy(tmp, p + 1);
-    } else {
-        paranoid_free(tmp);
-        paranoid_free(command);
-        return (-1);
-    }
-    sprintf(command, "dmesg | grep %s 2> /dev/null", tmp);
-    if (!(fin = popen(command, "r"))) {
-        log_OS_error("Cannot popen dmesg command");
-    } else {
-        fgets(tmp, MAX_STR_LEN - 1, fin);
-        while (!feof(fin) && !strstr(tmp, "GB") && !strstr(tmp, "MB")) {
-            fgets(tmp, MAX_STR_LEN - 1, fin);
-        }
-        if (pclose(fin)) {
-            log_OS_error("Cannot pclose dmesg fin");
-        }
-    }
-    if (!(p = strstr(tmp, "GB")) && !(p = strstr(tmp, "MB"))) {
-        log_msg(3, "Cannot find %s's size: dmesg isn't helping either.",
-                drive);
-        paranoid_free(tmp);
-        paranoid_free(command);
-        return (-1);
-    }
-    for (; !isdigit(*(p - 1)); p--);
-    *p = '\0';
-    for (p--; isdigit(*(p - 1)); p--);
-    outL = atol(p);
-    if (outL <= 0) {
-        paranoid_free(tmp);
-        paranoid_free(command);
-        return (-1);
-    }
-    if (strstr(tmp, "GB")) {
-        outL = outL * 1024;
-    }
-    paranoid_free(tmp);
-    paranoid_free(command);
-    return (outL * 19 / 20);
-#endif
-}
-#endif                          /* 0 */
-
-
-
-
 
 /**

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

@@ -1 @@
-/* libmondo-mountlist.c                            subroutines for handling mountlist
+/* subroutines for handling mountlist
    $Id$
-
-
-
-08/01
-- when evaluating mountlist, skip drive entirely if it does not exist
-
-07/14
-- always exclude /devpts, /proc, /sys from mountlist
-   
-06/29/2004
-- changed some char[] to *char
-- drivelist is struct now, not char[][]
-
-10/19/2003
-- format_device() --- contract /dev/md/N to /dev/mdN to
-  overcome devfs problems
-
-06/11
-- added support for 5th column in mountlist.txt, for labels
-
-05/08
-- added save_mountlist_to_disk() and load_mountlist()
-  and misc other funcs from mondorestore.c
-
-05/05
-- added Joshua Oreman's FreeBSD patches
-
-04/24
-- added some assert()'s
-
-04/23
-- cleaned up evaluate_drive_within_mountlist() a bit
-
-01/15/2003
-- added code for LVM (Brian Borgeson)
-
-10/19/2002
-- added some comments
-
-07/24/2002
-- created
 */
 
@@ -786 +745 @@
         }
 
-/*
-      for (i = strlen (drive); isdigit (drive[i - 1]); i--);
-      drive[i] = '\0';
-      if (get_phys_size_of_drive (drive) <= 0 && drive[i - 1] == 'p')
-    {
-      i--;
-      drive[i] = '\0';
-    }
-      for (j = 0; j < noof_drives && strcmp (drivelist[j], drive) != 0; j++);
-*/
-
         sprintf(tmp,
                 "Putting %s with size %lli in list of drives",

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

@@ -862 +862 @@
         return partition;
     }
+    /* then see if it's a dm style device */
+    if (c && strncmp(c, "/dm-", 5) == 0) {
+        /* yup it's dm, return the full path */
+        return partition;
+    }
 
     for (i = strlen(partition); isdigit(partition[i - 1]); i--)

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

@@ -1 +1 @@
 /***************************************************************************
-mondo-prep.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$
+$Id$
 ***************************************************************************/
 
@@ -19 +11 @@
  *                                                                         *
  ***************************************************************************/
-
-/* mondo-prep.c             Hugo Rabson
-
-
-
-07/20
-- when starting RAID, don't do it twice :)
-- moved Joshua's new get_phys_size_of_drive() code
-  from resize_drive... into get_phys_size_of_drive()
-
-06/29
-- make sure software RAID devices are formatted IF user says they're to be
-- drivelist is struct now, not char[][]
-
-06/26
-- drop make_relevant_partition_bootable(); do it yourself in C (mostly)
-- offer to reboot if partition table is locked up by the kernel
-
-06/22
-- be sure not to resize non-NTFS images when restoring
-- set non-NTFS images' partition types properly
-
-06/19
-- shut down all LVMs and VGs before prepping
-
-05/07
-- usage of parted2fdisk instead of fdisk alone (ia32/ia64 compatibility)
-  BCO
-
-03/31
-- rewrote partitioning and formatting code to call fdisk once per disk
-
-10/21/2003
-- suspend/resume Newt gui before/after calling do_my_funky_lvm_stuff()
-
-10/20
-- rewrote format_everything() - what a mess it was.
-  It now does things in three phases:-
-  - formats software RAID devices (/dev/md0, etc.)
-  - formats and configures LVM devices
-  - formats regular partitions (/dev/hda1, /dev/sdb2, etc.) 
-    and any LVMs recently prepped
-
-10/07
-- use strstr(format, "raid") instead of strcmp(format,"raid") to determin
-  if partition is a RAID component
-
-09/23
-- better comments
-
-09/18
-- better logging of RAID activity
-
-05/05
-- added Joshua Oreman's FreeBSD patches
-
-04/30
-- added textonly mode
-
-04/24
-- added lots of assert()'s and log_OS_error()'s
-
-04/21
-- format_everything() --- don't let bar go too far
-- mkfs -c to check for bad blocks when formatting
-
-04/04
-- misc clean-up (Tom Mortell)
-
-01/15/2003
-- added code for LVM and SW Raid (Brian Borgeson)
-
-12/10/2002
-- line 1238: friendlier output
-
-11/20
-- when wiping a given device in preparation for partitioning + formatting
-  it, don't wipe the MBR; just the partition table. That allows for
-  stupid-ass Compaq users who like to play with their MBR's.
-- disable mountlist.txt-->mountlist.txt.pre-resize copying (superfluous)
-
-09/09
-- run_program_and_log_output() now takes boolean operator to specify
-  whether it will log its activities in the event of _success_
-
-07/01 - 07/31
-- added hooks to libmondo
-- RAID enhancements (Philippe de Muyter)
-
-01/01 - 03/31
-- partition_device() will refuse to partition /dev/mdX now (cos it's a
-  virtual drive); however, it will return 0 (i.e. not an error)
-- make_list_of_drives() will exclude /dev/md* from list
-- mkreiserfs -ff instead of -q (Andy Glass)
-- don't resize drive if drive not found (or if its size cannot be det'd)
-- when generating list of drives from mountlist, skip the 'p' at the end
-  of drive name if /dev/ida/ or /dev/cciss/; just do it (Michael Eisenberg)
-- don't specify journal size when formatting ext3
-  (used to have -Jsize=10 in the call to mkfs)
-- handles files >2GB in size
-- format interactively, if Interactive Mode
-- removed reference to g_tape_size
-- when executing /tmp/i-want-my-lvm, only record the error# if the command
-  was _not_ an 'insmod' command
-- pass partition size to fdisk in Kilobytes now, not Megabytes
-- log fdisk's output to /tmp/mondo-restore.log if it fails
-- don't try to format partitions of type 'image'
-- don't type to set types of 'image' partitions
-- if format code is 1 or 2 chars then assume it is a hex string
-- took out all '/ /' comments
-- don't extrapolate/add partition from RAID dev to mountlist if it's already
-  present in mountlist
-- less repetitive logging in the event of vacuum-packing of last part'n
-- no extrapolation at all: RAID partitions should be listed in mountlist
-  already, thanks to either Mindi v0.5x or the mountlist editor itself
-- no longer say, 'and logging to...' when setting a partition's type
-- don't run mkfs on RAID partitions (/dev/hd*, /dev/sd*); just set type
-- the setting of a partition's type now takes place in a separate subroutine
-  from the subroutine that actually creates the partition
-- no need to set type if 83: 83 is the default (under fdisk)
-- turned on '-Wall'; cleaned up some cruft
-- if vacuum-packing partition (i.e. size=0MB --> max) then say, "(maximum)"
-  not, "(0 MB)"
-
-11/22/2001
-- preliminary code review
-- created on Nov 22nd, 2001
-*/
 
 /**