From e51b4ca5fe376e6abc7b0eb2b2b149803b91aa08 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Mon, 21 Mar 2022 10:20:49 +0100 Subject: [PATCH] cli: indicate missing radio hardware in "nmcli radio" When no radio hardware is present in the system, "nmcli radio" currently displays: WIFI-HW WIFI WWAN-HW WWAN enabled enabled enabled enabled which is misleading. Use the new RadioFlags property to display "missing" in the *-HW columns when there is no hardware for the given radio technology. https://bugzilla.redhat.com/show_bug.cgi?id=1996918 --- src/nmcli/general.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/nmcli/general.c b/src/nmcli/general.c index 65437e7966..d5a6788f79 100644 --- a/src/nmcli/general.c +++ b/src/nmcli/general.c @@ -145,12 +145,22 @@ _metagen_general_status_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS) v_bool = nm_client_networking_get_enabled(nmc->client); goto enabled_out; case NMC_GENERIC_INFO_TYPE_GENERAL_STATUS_WIFI_HW: + if (!(nm_client_get_radio_flags(nmc->client) & NM_RADIO_FLAG_WLAN_AVAILABLE)) { + NMC_HANDLE_COLOR(NM_META_COLOR_NONE); + value = N_("missing"); + goto translate_and_out; + } v_bool = nm_client_wireless_hardware_get_enabled(nmc->client); goto enabled_out; case NMC_GENERIC_INFO_TYPE_GENERAL_STATUS_WIFI: v_bool = nm_client_wireless_get_enabled(nmc->client); goto enabled_out; case NMC_GENERIC_INFO_TYPE_GENERAL_STATUS_WWAN_HW: + if (!(nm_client_get_radio_flags(nmc->client) & NM_RADIO_FLAG_WWAN_AVAILABLE)) { + NMC_HANDLE_COLOR(NM_META_COLOR_NONE); + value = N_("missing"); + goto translate_and_out; + } v_bool = nm_client_wwan_hardware_get_enabled(nmc->client); goto enabled_out; case NMC_GENERIC_INFO_TYPE_GENERAL_STATUS_WWAN: