Permalink
Browse files

part-get-bootable: Fix when partitions are missing or unordered (RHBZ…

…#602997).

The original fix for this in
commit 511c82d 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.
  • Loading branch information...
rwmjones committed Jun 22, 2012
1 parent 8098d06 commit 4d3ec25b47361601604e2f585178393e60f4cd4d
Showing with 16 additions and 4 deletions.
  1. +16 −4 daemon/parted.c
View
@@ -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;
}

0 comments on commit 4d3ec25

Please sign in to comment.