From 9a8913176113eacff0f236c247d6e1bb244afdd9 Mon Sep 17 00:00:00 2001 From: George Dunlap Date: Tue, 4 Dec 2012 15:50:20 +0000 Subject: xl: Check for duplicate vncdisplay options, and return an error If the user has set a vnc display number both in vnclisten (with "xxxx:yy"), and with vncdisplay, throw an error. Update man pages to match. Signed-off-by: George Dunlap Acked-by: Ian Campbell Committed-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'docs') diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index fe4fac95dd..dc3f49417c 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -350,11 +350,17 @@ other VNC-related settings. The default is to enable this. Specifies the IP address, and optionally VNC display number, to use. +NB that if you specify the display number here, you should not use +vncdisplay. + =item C Specifies the VNC display number to use. The actual TCP port number will be DISPLAYNUM+5900. +NB that you should not use this option if you set the displaynum in the +vnclisten string. + =item C Requests that the VNC display setup search for a free TCP port to use. -- cgit v1.2.3