From: Karel Zak Date: Tue, 24 Mar 2020 11:00:28 +0000 (+0100) Subject: fdisk: make sure label defined for some menu entries X-Git-Tag: v2.36-rc1~168 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=53a808562d5e19ae91fd37bbe49336472fb3f8ca;p=thirdparty%2Futil-linux.git fdisk: make sure label defined for some menu entries Signed-off-by: Karel Zak --- diff --git a/disk-utils/fdisk-menu.c b/disk-utils/fdisk-menu.c index 71355f6848..51ae7b5e6e 100644 --- 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 */