fdisk: make sure label defined for some menu entries

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/disk-utils/fdisk-menu.c b/disk-utils/fdisk-menu.c
index 71355f684833968b9dc0e216789067d78d3b9f82..51ae7b5e6e912eeefeab203bd83c76ae530232b0 100644 (file)
--- a/disk-utils/fdisk-menu.c
+++ b/disk-utils/fdisk-menu.c
@@ -279,7 +279,7 @@ static const struct menu_entry *next_menu_entry(
                /* no more entries */
                if (e->title == NULL ||
                /* menu wanted for specified labels only */
-                   (m->label && lb && !(m->label & type)) ||
+                   (m->label && (!lb || !(m->label & type))) ||
                /* unwanted for nested PT */
                    (m->nonested && parent) ||
                /* menu excluded for specified labels */
@@ -296,7 +296,7 @@ static const struct menu_entry *next_menu_entry(
                /* excluded for the current label */
                if ((e->exclude && lb && e->exclude & type) ||
                /* entry wanted for specified labels only */
-                   (e->label && lb && !(e->label & type)) ||
+                   (e->label && (!lb || !(e->label & type))) ||
                /* exclude non-expert entries in expect mode */
                    (e->expert == 0 && fdisk_is_details(cxt)) ||
                /* nested only */