Changeset 1297 in MondoRescue for branches/stable/mondo/src/common/libmondo-mountlist.c
- Timestamp:
- Apr 12, 2007, 1:56:35 AM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/stable/mondo/src/common/libmondo-mountlist.c
r1180 r1297 411 411 412 412 for (curr_part_no = 1; curr_part_no < 99; curr_part_no++) { 413 mr_asprintf(&device, "%s%d", drive, curr_part_no); 413 if ((strstr(device, "/cciss/") != NULL) || 414 (strstr(device, "/ataraid/") != NULL) || 415 (strstr(device, "/ida/") != NULL) || 416 (strstr(device, "/rd/") != NULL)) { 417 mr_asprintf(&device, "%sp%d", drive, curr_part_no); 418 sprintf(device, "%sp%d", drive, curr_part_no); 419 } else { 420 mr_asprintf(&device, "%s%d", drive, curr_part_no); 421 } 414 422 pos = find_device_in_mountlist(mountlist, device); 415 423 if (pos < 0) { … … 418 426 if (physical_drive_size < 0) { 419 427 mr_asprintf(&tmp, " %s refers to non-existent hardware.", device); 428 log_it(tmp); 420 429 strcat(flaws_str, tmp); 421 430 res++; … … 848 857 #if linux 849 858 sscanf(incoming, 850 "%s %s %s %s %s ",859 "%s %s %s %s %s %s", 851 860 mountlist->el[items].device, 852 861 mountlist->el[items].mountpoint, 853 862 mountlist->el[items].format, 854 siz, mountlist->el[items].label );863 siz, mountlist->el[items].label, mountlist->el[items].uuid); 855 864 #elif __FreeBSD__ 856 865 sscanf(incoming, … … 860 869 mountlist->el[items].format, siz); 861 870 strcpy(mountlist->el[items].label, ""); 871 strcpy(mountlist->el[items].uuid, ""); 862 872 #endif 863 873 … … 914 924 mountlist->el[items].format, 915 925 mountlist->el[items].size, 916 mountlist->el[items].label); 926 mountlist->el[items].label, 927 mountlist->el[items].uuid); 917 928 items++; 918 929 } … … 956 967 mountlist->el[i].device, mountlist->el[i].mountpoint, 957 968 mountlist->el[i].format, mountlist->el[i].size, 958 mountlist->el[i].label );969 mountlist->el[i].label, mountlist->el[i].uuid); 959 970 } 960 971 paranoid_fclose(fout);
Note:
See TracChangeset
for help on using the changeset viewer.