[pve-devel] applied: [PATCH container 1/2] doc: add dhcp/manual to netX ip description

[Wolfgang Bumiller]

applied both patches

On Mon, May 15, 2017 at 09:44:18AM +0200, Fabian Grünbichler wrote:
> and shorten IPv4Format to IPv4
> 
> Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
> ---
> As reported in https://forum.proxmox.com/threads/pct-man-page-incorrect.34637/#post-169700
> 
>  src/PVE/LXC/Config.pm | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm
> index 547e7b5..57b3297 100644
> --- a/src/PVE/LXC/Config.pm
> +++ b/src/PVE/LXC/Config.pm
> @@ -509,7 +509,7 @@ our $netconf_desc = {
>      ip => {
>  	type => 'string',
>  	format => 'pve-ipv4-config',
> -	format_description => 'IPv4Format/CIDR',
> +	format_description => '(IPv4/CIDR|dhcp|manual)',
>  	description => 'IPv4 address in CIDR format.',
>  	optional => 1,
>      },
> -- 
> 2.1.4