|
 |
9119d9 |
From 60f875ebfda5c5512fec0f324d6e0ddf540f53f1 Mon Sep 17 00:00:00 2001
|
|
|
9119d9 |
Message-Id: <60f875ebfda5c5512fec0f324d6e0ddf540f53f1@dist-git>
|
|
|
9119d9 |
From: Martin Kletzander <mkletzan@redhat.com>
|
|
|
9119d9 |
Date: Fri, 21 Nov 2014 12:58:09 +0100
|
|
|
9119d9 |
Subject: [PATCH] virsh: sync domdisplay help and manual
|
|
|
9119d9 |
|
|
|
9119d9 |
https://bugzilla.redhat.com/show_bug.cgi?id=997802
|
|
|
9119d9 |
|
|
|
9119d9 |
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
|
9119d9 |
(cherry picked from commit 4c1b9e22b99cdc5e2ca38dd391a8e7142b31d51c)
|
|
|
9119d9 |
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
|
9119d9 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
9119d9 |
---
|
|
|
9119d9 |
tools/virsh-domain.c | 2 +-
|
|
|
9119d9 |
tools/virsh.pod | 8 +++++---
|
|
|
9119d9 |
2 files changed, 6 insertions(+), 4 deletions(-)
|
|
|
9119d9 |
|
|
|
9119d9 |
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
|
|
|
9119d9 |
index f182dd0..68c28fa 100644
|
|
|
9119d9 |
--- a/tools/virsh-domain.c
|
|
|
9119d9 |
+++ b/tools/virsh-domain.c
|
|
|
9119d9 |
@@ -9518,7 +9518,7 @@ static const vshCmdOptDef opts_domdisplay[] = {
|
|
|
9119d9 |
},
|
|
|
9119d9 |
{.name = "type",
|
|
|
9119d9 |
.type = VSH_OT_DATA,
|
|
|
9119d9 |
- .help = N_("select particular graphics display "
|
|
|
9119d9 |
+ .help = N_("select particular graphical display "
|
|
|
9119d9 |
"(e.g. \"vnc\", \"spice\", \"rdp\")")
|
|
|
9119d9 |
},
|
|
|
9119d9 |
{.name = NULL}
|
|
|
9119d9 |
diff --git a/tools/virsh.pod b/tools/virsh.pod
|
|
|
9119d9 |
index 0c25d59..c88c417 100644
|
|
|
9119d9 |
--- a/tools/virsh.pod
|
|
|
9119d9 |
+++ b/tools/virsh.pod
|
|
|
9119d9 |
@@ -1097,11 +1097,13 @@ I<size> is a scaled integer (see B<NOTES> above) which defaults to KiB
|
|
|
9119d9 |
"B" to get bytes (note that for historical reasons, this differs from
|
|
|
9119d9 |
B<vol-resize> which defaults to bytes without a suffix).
|
|
|
9119d9 |
|
|
|
9119d9 |
-=item B<domdisplay> I<domain> [I<--include-password>]
|
|
|
9119d9 |
+=item B<domdisplay> I<domain> [I<--include-password>] [[I<--type>] B<type>]
|
|
|
9119d9 |
|
|
|
9119d9 |
Output a URI which can be used to connect to the graphical display of the
|
|
|
9119d9 |
-domain via VNC, SPICE or RDP. If I<--include-password> is specified, the
|
|
|
9119d9 |
-SPICE channel password will be included in the URI.
|
|
|
9119d9 |
+domain via VNC, SPICE or RDP. The particular graphical display type can
|
|
|
9119d9 |
+be selected using the B<type> parameter (e.g. "vnc", "spice", "rdp"). If
|
|
|
9119d9 |
+I<--include-password> is specified, the SPICE channel password will be
|
|
|
9119d9 |
+included in the URI.
|
|
|
9119d9 |
|
|
|
9119d9 |
=item B<domfsfreeze> I<domain> [[I<--mountpoint>] B<mountpoint>...]
|
|
|
9119d9 |
|
|
|
9119d9 |
--
|
|
|
9119d9 |
2.1.3
|
|
|
9119d9 |
|