Changeset 1297 in MondoRescue for branches/stable/mondo/src/common

Timestamp:

Apr 12, 2007, 1:56:35 AM (17 years ago)

Author:

Bruno Cornec

Message:

• evaluate_drive_within_mountlist is a private function
• support UUID in mondorestore (Fix for #103)
• Fix a bug in size computation for cciss and similar devices needing a p before their partition name
• Fix 2 references to grep -x which are not working during a restore process due to busybox limits of grep command (Fix for #96)

Location:

branches/stable/mondo/src/common

Files:

• libmondo-mountlist-EXT.h (modified) (1 diff)
• libmondo-mountlist.c (modified) (6 diffs)
• libmondo-mountlist.h (modified) (1 diff)
• mondostructures.h (modified) (2 diffs)

branches/stable/mondo/src/common/libmondo-mountlist-EXT.h

@@ -1 +1 @@
 /* libmondo-mountlist-EXT.h */
 
-extern int evaluate_drive_within_mountlist(struct mountlist_itself
-                                           *mountlist, char *drive,
-                                           char *flaws_str);
 extern int evaluate_mountlist(struct mountlist_itself *mountlist,
                               char *flaws_str_A, char *flaws_str_B,

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

@@ -411 +411 @@
 
     for (curr_part_no = 1; curr_part_no < 99; curr_part_no++) {
-        mr_asprintf(&device, "%s%d", drive, curr_part_no);
+        if ((strstr(device, "/cciss/") != NULL) ||
+            (strstr(device, "/ataraid/") != NULL) ||
+            (strstr(device, "/ida/") != NULL) ||
+            (strstr(device, "/rd/") != NULL)) {
+                mr_asprintf(&device, "%sp%d", drive, curr_part_no);
+                sprintf(device, "%sp%d", drive, curr_part_no);
+            } else {    
+                mr_asprintf(&device, "%s%d", drive, curr_part_no);
+            }
         pos = find_device_in_mountlist(mountlist, device);
         if (pos < 0) {
@@ -418 +426 @@
         if (physical_drive_size < 0) {
             mr_asprintf(&tmp, " %s refers to non-existent hardware.", device);
+            log_it(tmp);
             strcat(flaws_str, tmp);
             res++;
@@ -848 +857 @@
 #if linux
         sscanf(incoming,
-               "%s %s %s %s %s",
+               "%s %s %s %s %s %s",
                mountlist->el[items].device,
                mountlist->el[items].mountpoint,
                mountlist->el[items].format,
-               siz, mountlist->el[items].label);
+               siz, mountlist->el[items].label, mountlist->el[items].uuid);
 #elif __FreeBSD__
         sscanf(incoming,
@@ -860 +869 @@
                mountlist->el[items].format, siz);
         strcpy(mountlist->el[items].label, "");
+        strcpy(mountlist->el[items].uuid, "");
 #endif
 
@@ -914 +924 @@
                      mountlist->el[items].format,
                      mountlist->el[items].size,
-                     mountlist->el[items].label);
+                    mountlist->el[items].label,
+                    mountlist->el[items].uuid);
             items++;
         }
@@ -956 +967 @@
                 mountlist->el[i].device, mountlist->el[i].mountpoint,
                 mountlist->el[i].format, mountlist->el[i].size,
-                mountlist->el[i].label);
+                mountlist->el[i].label, mountlist->el[i].uuid);
     }
     paranoid_fclose(fout);

branches/stable/mondo/src/common/libmondo-mountlist.h

@@ -4 +4 @@
 
 
-int evaluate_drive_within_mountlist(struct mountlist_itself *mountlist,
-                                    char *drive, char *flaws_str);
 int evaluate_mountlist(struct mountlist_itself *mountlist,
                        char *flaws_str_A, char *flaws_str_B,

branches/stable/mondo/src/common/mondostructures.h

@@ -45 +45 @@
    */
     char label[256];
+
+    /**
+     * This is the filesystem UUID (if there is one). If not, this should be "".
+     */
+    char uuid[64];
 };
 
@@ -785 +790 @@
 };
 
-
 /**
  * A tape catalog, made of a list of @p s_tapecat_entry.
  */
 struct s_tapecatalog {
-        /**
-     * The number of entries in the tape catalog.
-     */
-    int entries;
-
-        /**
-     * The entries themselves, all @p entries of them.
-     */
-    struct s_tapecat_entry el[MAX_TAPECATALOG_ENTRIES];
-};
+               /**
+        * The number of entries in the tape catalog.
+        */
+       int entries;
+
+               /**
+        * The entries themselves, all @p entries of them.
+        */
+       struct s_tapecat_entry el[MAX_TAPECATALOG_ENTRIES];
+};