From 660933ce579916e4a8a8e2c6a1edaa3760f8bb0e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 22 Jun 2012 10:54:57 +0100 Subject: part-get-bootable: Fix when partitions are missing or unordered (RHBZ#602997). The original fix for this in commit 511c82df46f5c6f4a7f984fdb81d4691038ed6da 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 4d3ec25b47361601604e2f585178393e60f4cd4d) --- daemon/parted.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/daemon/parted.c b/daemon/parted.c index 1a020f9b..ceefc4af 100644 --- a/daemon/parted.c +++ b/daemon/parted.c @@ -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; } -- cgit