Changeset 1295 in MondoRescue for branches/2.2.2/mondo/src/common/libmondo-mountlist.c

Timestamp:

Apr 11, 2007, 8:59:49 PM (17 years ago)

Author:

Bruno Cornec

Message:

• evaluate_drive_within_mountlist is a private function
• support UUID in mondorestore (Improvements for #103)
• Fix a bug in size computation for cciss and similar devices needing a p before their partition name

File:

• branches/2.2.2/mondo/src/common/libmondo-mountlist.c (modified) (7 diffs)

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

@@ -400 +400 @@
 
     /*@ long *********************************************************** */
-    long physical_drive_size = 0;
-    long amount_allocated = 0;
+    long physical_drive_size = 0L;
+    long amount_allocated = 0L;
 
     /*@ pointers ******************************************************* */
@@ -433 +433 @@
 
     for (curr_part_no = 1; curr_part_no < 99; curr_part_no++) {
-        sprintf(device, "%s%d", drive, curr_part_no);
+        if ((strstr(device, "/cciss/") != NULL) ||
+            (strstr(device, "/ataraid/") != NULL) ||
+            (strstr(device, "/ida/") != NULL) ||
+            (strstr(device, "/rd/") != NULL)) {
+                sprintf(device, "%sp%d", drive, curr_part_no);
+            } else {    
+                sprintf(device, "%s%d", drive, curr_part_no);
+            }
         pos = find_device_in_mountlist(mountlist, device);
         if (pos < 0) {
@@ -440 +447 @@
         if (physical_drive_size < 0) {
             sprintf(tmp, " %s refers to non-existent hardware.", device);
+            log_it(tmp);
             strcat(flaws_str, tmp);
             res++;
@@ -969 +977 @@
 #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,
@@ -981 +989 @@
                mountlist->el[items].format, siz);
         strcpy(mountlist->el[items].label, "");
+        strcpy(mountlist->el[items].uuid, "");
 #endif
 
@@ -1029 +1038 @@
 
             sprintf(tmp,
-                    "%s %s %s %lld %s",
+                    "%s %s %s %lld %s %s",
                     mountlist->el[items].device,
                     mountlist->el[items].mountpoint,
                     mountlist->el[items].format,
-                    mountlist->el[items].size, mountlist->el[items].label);
+                    mountlist->el[items].size,
+                    mountlist->el[items].label,
+                    mountlist->el[items].uuid);
 
             log_it(tmp);
@@ -1079 +1090 @@
                 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);