From 21cfb5e32482295919b361579c136908ec6bec8f Mon Sep 17 00:00:00 2001 From: Chris Lumens Date: Mar 09 2021 06:18:51 +0000 Subject: Low: tools: Adjust fencing shown indicator in crm_mon. If any of the various fencing flags are set, but not all of them, no '*' will be shown next to the fencing line in the interactive change screen. This makes it seem like fencing should not be shown, and hitting 'm' should toggle the fencing display on. However, that's not the case and hitting 'm' will actually toggle fencing off. Hitting it again will toggle it on and the '*' will appear. This is confusing, so just display the '*' if any fencing flag is set. patch_name: 027-crm_mon.patch present_in_specfile: true location_in_specfile: 27 squash_commits: true --- diff --git a/tools/crm_mon.c b/tools/crm_mon.c index 2179f53..8ec97bb 100644 --- a/tools/crm_mon.c +++ b/tools/crm_mon.c @@ -984,7 +984,10 @@ detect_user_input(GIOChannel *channel, GIOCondition condition, gpointer user_dat print_option_help(out, 'R', pcmk_is_set(options.mon_ops, mon_op_print_clone_detail)); print_option_help(out, 'b', pcmk_is_set(options.mon_ops, mon_op_print_brief)); print_option_help(out, 'j', pcmk_is_set(options.mon_ops, mon_op_print_pending)); - print_option_help(out, 'm', pcmk_is_set(show, mon_show_fencing_all)); + print_option_help(out, 'm', pcmk_any_flags_set(show, + mon_show_fence_failed + |mon_show_fence_pending + |mon_show_fence_worked)); out->info(out, "%s", "\nToggle fields via field letter, type any other key to return"); }