Changeset 1295 in MondoRescue for branches/2.2.2/mondo/src/common
- Timestamp:
- Apr 11, 2007, 8:59:49 PM (17 years ago)
- Location:
- branches/2.2.2/mondo/src/common
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.2/mondo/src/common/libmondo-mountlist-EXT.h
r128 r1295 1 1 /* libmondo-mountlist-EXT.h */ 2 2 3 extern int evaluate_drive_within_mountlist(struct mountlist_itself4 *mountlist, char *drive,5 char *flaws_str);6 3 extern int evaluate_mountlist(struct mountlist_itself *mountlist, 7 4 char *flaws_str_A, char *flaws_str_B, -
branches/2.2.2/mondo/src/common/libmondo-mountlist.c
r1236 r1295 400 400 401 401 /*@ long *********************************************************** */ 402 long physical_drive_size = 0 ;403 long amount_allocated = 0 ;402 long physical_drive_size = 0L; 403 long amount_allocated = 0L; 404 404 405 405 /*@ pointers ******************************************************* */ … … 433 433 434 434 for (curr_part_no = 1; curr_part_no < 99; curr_part_no++) { 435 sprintf(device, "%s%d", drive, curr_part_no); 435 if ((strstr(device, "/cciss/") != NULL) || 436 (strstr(device, "/ataraid/") != NULL) || 437 (strstr(device, "/ida/") != NULL) || 438 (strstr(device, "/rd/") != NULL)) { 439 sprintf(device, "%sp%d", drive, curr_part_no); 440 } else { 441 sprintf(device, "%s%d", drive, curr_part_no); 442 } 436 443 pos = find_device_in_mountlist(mountlist, device); 437 444 if (pos < 0) { … … 440 447 if (physical_drive_size < 0) { 441 448 sprintf(tmp, " %s refers to non-existent hardware.", device); 449 log_it(tmp); 442 450 strcat(flaws_str, tmp); 443 451 res++; … … 969 977 #if linux 970 978 sscanf(incoming, 971 "%s %s %s %s %s ",979 "%s %s %s %s %s %s", 972 980 mountlist->el[items].device, 973 981 mountlist->el[items].mountpoint, 974 982 mountlist->el[items].format, 975 siz, mountlist->el[items].label );983 siz, mountlist->el[items].label, mountlist->el[items].uuid); 976 984 #elif __FreeBSD__ 977 985 sscanf(incoming, … … 981 989 mountlist->el[items].format, siz); 982 990 strcpy(mountlist->el[items].label, ""); 991 strcpy(mountlist->el[items].uuid, ""); 983 992 #endif 984 993 … … 1029 1038 1030 1039 sprintf(tmp, 1031 "%s %s %s %lld %s ",1040 "%s %s %s %lld %s %s", 1032 1041 mountlist->el[items].device, 1033 1042 mountlist->el[items].mountpoint, 1034 1043 mountlist->el[items].format, 1035 mountlist->el[items].size, mountlist->el[items].label); 1044 mountlist->el[items].size, 1045 mountlist->el[items].label, 1046 mountlist->el[items].uuid); 1036 1047 1037 1048 log_it(tmp); … … 1079 1090 mountlist->el[i].device, mountlist->el[i].mountpoint, 1080 1091 mountlist->el[i].format, mountlist->el[i].size, 1081 mountlist->el[i].label );1092 mountlist->el[i].label, mountlist->el[i].uuid); 1082 1093 } 1083 1094 paranoid_fclose(fout); -
branches/2.2.2/mondo/src/common/libmondo-mountlist.h
r128 r1295 4 4 5 5 6 int evaluate_drive_within_mountlist(struct mountlist_itself *mountlist,7 char *drive, char *flaws_str);8 6 int evaluate_mountlist(struct mountlist_itself *mountlist, 9 7 char *flaws_str_A, char *flaws_str_B, -
branches/2.2.2/mondo/src/common/mondostructures.h
r998 r1295 62 62 */ 63 63 char label[256]; 64 65 /** 66 * This is the filesystem UUID (if there is one). If not, this should be "". 67 */ 68 char uuid[64]; 64 69 }; 65 70
Note:
See TracChangeset
for help on using the changeset viewer.