Re: [PATCH 2/2] src/main.c: Fix RFKILL logging domain

[Dan Williams <dcbw redhat com>]

On Mon, 2011-02-07 at 22:45 +0200, Ozan Çağlayan wrote:
> Correct logging domain for RFKILL is RFKILL not RKILL.

Pushed:

e9c8ba4e3dde7332fb1002fa54cda93166aa04cb (master)
49bdcc31bed237619aa28c814ee52e371c79aada (0.8.x)

Thanks!
Dan

> Also fix the man page.
> ---
>  man/NetworkManager.conf.5.in |    2 +-
>  src/main.c                   |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/man/NetworkManager.conf.5.in b/man/NetworkManager.conf.5.in
> index a45adde..2d7a9e8 100644
> --- a/man/NetworkManager.conf.5.in
> +++ b/man/NetworkManager.conf.5.in
> @@ -160,7 +160,7 @@ from earlier levels; thus setting the log level to INFO also logs error and
>  warning messages.
>  .TP
>  .B domains=\fI<domain1>,<domain2>, ...\fP
> -The following log domains are available: [NONE, HW, RKILL, ETHER, WIFI, BT, MB,
> +The following log domains are available: [NONE, HW, RFKILL, ETHER, WIFI, BT, MB,
>  DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT,
>  USER_SET, SYS_SET, SUSPEND, CORE, DEVICE, OLPC, WIMAX].  When "NONE" is given by
>  itself, logging is disabled.  MB = Mobile Broadband, USER_SET = user settings
> diff --git a/src/main.c b/src/main.c
> index 1e3db21..211a5b9 100644
> --- a/src/main.c
> +++ b/src/main.c
> @@ -482,7 +482,7 @@ main (int argc, char *argv[])
>  		{ "plugins", 0, 0, G_OPTION_ARG_STRING, &plugins, "List of plugins separated by ','", "plugin1,plugin2" },
>  		{ "log-level", 0, 0, G_OPTION_ARG_STRING, &log_level, "Log level: one of [ERR, WARN, INFO, DEBUG]", "INFO" },
>  		{ "log-domains", 0, 0, G_OPTION_ARG_STRING, &log_domains,
> -		        "Log domains separated by ',': any combination of [NONE,HW,RKILL,ETHER,WIFI,BT,MB,DHCP4,DHCP6,PPP,WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,SHARING,SUPPLICANT,USER_SET,SYS_SET,SUSPEND,CORE,DEVICE,OLPC]",
> +		        "Log domains separated by ',': any combination of [NONE,HW,RFKILL,ETHER,WIFI,BT,MB,DHCP4,DHCP6,PPP,WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,SHARING,SUPPLICANT,USER_SET,SYS_SET,SUSPEND,CORE,DEVICE,OLPC]",
>  		        "HW,RFKILL,WIFI" },
>  		{NULL}
>  	};