mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-22 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

part-get-bootable: Fix when partitions are missing or unordered (RHBZ#602997).

Browse Source 
The original fix for this in
commit 511c82df46 was not complete, in
that it did not fix the case of the old (pre '-m' option) parted.
This doesn't matter for Fedora, but it matters for RHEL 5 which has
this ancient parted.
(cherry picked from commit 4d3ec25b47)
This commit is contained in:
Richard W.M. Jones
2012-06-22 10:54:57 +01:00
parent b37629fc93
commit 660933ce57
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
daemon/parted.c
View File

@@ -696,10 +696,22 @@ do_part_get_bootable (const char *device, int partnum)
}
size_t col = p - lines[header];
/* Look for the line corresponding to this partition number. */
row = start + partnum - 1;
if (row >= count_strings (lines) || !STRPREFIX (lines[row], " ")) {
reply_with_error ("partition number out of range: %d", partnum);
/* Partitions may not be in any order, so we have to look for
* the matching partition number (RHBZ#602997).
*/
int pnum;
for (row = start; lines[row] != NULL; ++row) {
if (sscanf (lines[row], " %d", &pnum) != 1) {
reply_with_error ("could not parse row from output of parted print command: %s", lines[row]);
free_strings (lines);
return -1;
}
if (pnum == partnum)
break;
}
if (lines[row] == NULL) {
reply_with_error ("partition number %d not found", partnum);
free_strings (lines);
return -1;
}