[lxc-devel] [PATCH] lxc-info: Limit information when not running

[Serge Hallyn]

Quoting Stéphane Graber (stgraber at ubuntu.com):
> Don't try to print the PID, IP addresses or statistics for a container
> that's not current running.
> 
> Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>

Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>

> ---
>  src/lxc/lxc_info.c | 32 +++++++++++++++++---------------
>  1 file changed, 17 insertions(+), 15 deletions(-)
> 
> diff --git a/src/lxc/lxc_info.c b/src/lxc/lxc_info.c
> index b515087..2bd695e 100644
> --- a/src/lxc/lxc_info.c
> +++ b/src/lxc/lxc_info.c
> @@ -301,23 +301,25 @@ static int print_info(const char *name, const char *lxcpath)
>  		print_info_msg_str("State:", c->state(c));
>  	}
>  
> -	if (pid) {
> -		pid_t initpid;
> +	if (c->is_running(c)) {
> +		if (pid) {
> +			pid_t initpid;
>  
> -		initpid = c->init_pid(c);
> -		if (initpid >= 0)
> -			print_info_msg_int("PID:", initpid);
> -	}
> +			initpid = c->init_pid(c);
> +			if (initpid >= 0)
> +				print_info_msg_int("PID:", initpid);
> +		}
>  
> -	if (ips) {
> -		char **addresses = c->get_ips(c, NULL, NULL, 0);
> -		if (addresses) {
> -			char *address;
> -			i = 0;
> -			while (addresses[i]) {
> -				address = addresses[i];
> -				print_info_msg_str("IP:", address);
> -				i++;
> +		if (ips) {
> +			char **addresses = c->get_ips(c, NULL, NULL, 0);
> +			if (addresses) {
> +				char *address;
> +				i = 0;
> +				while (addresses[i]) {
> +					address = addresses[i];
> +					print_info_msg_str("IP:", address);
> +					i++;
> +				}
>  			}
>  		}
>  	}
> -- 
> 1.8.5.3
> 
> _______________________________________________
> lxc-devel mailing list
> lxc-devel at lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel