Commit 79c8a145ddff98d9c5bc70e67c5a861f67c50484 changed the numerical values of fdisk_labeltype and broke the menu functionality, mixing main and expert menus. Revert this change along with the label comment regarding it matching labeltype. This is no longer valid since the original patch that lead to this modification assumed that __probe_labels() would use these indices when creating a default DOS/SUN disklabel, see http://www.spinics.net/lists/util-linux-ng/msg06509.html Reported-by: Petr Uzel <petr.uzel@xxxxxxx> Signed-off-by: Davidlohr Bueso <dave@xxxxxxx> --- fdisks/fdisk.h | 12 ++++++------ fdisks/utils.c | 2 -- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/fdisks/fdisk.h b/fdisks/fdisk.h index 29b57fe..260445a 100644 --- a/fdisks/fdisk.h +++ b/fdisks/fdisk.h @@ -226,13 +226,13 @@ extern sector_t get_nr_sects(struct partition *p); * Supported partition table types (labels) */ enum fdisk_labeltype { - ANY_LABEL = -1, DOS_LABEL = 1, - SUN_LABEL, - SGI_LABEL, - AIX_LABEL, - OSF_LABEL, - MAC_LABEL, + SUN_LABEL = 2, + SGI_LABEL = 4, + AIX_LABEL = 8, + OSF_LABEL = 16, + MAC_LABEL = 32, + ANY_LABEL = -1 }; extern enum fdisk_labeltype disklabel; diff --git a/fdisks/utils.c b/fdisks/utils.c index c4ffe04..dbb422d 100644 --- a/fdisks/utils.c +++ b/fdisks/utils.c @@ -36,8 +36,6 @@ int fdisk_debug_mask; /* * Label probing functions. - * Must have the same order as fdisk_labeltype as the index - * depends on it. */ static const struct fdisk_label *labels[] = { -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe util-linux" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
