|
 |
140d58 |
From 77d66094d945e38608f98347bd3c117a90a01913 Mon Sep 17 00:00:00 2001
|
|
|
140d58 |
From: Pavel Grunt <pgrunt@redhat.com>
|
|
|
140d58 |
Date: Fri, 3 Mar 2017 14:08:46 +0100
|
|
|
140d58 |
Subject: [PATCH 26/26] virt-viewer: Adjust name-id-uuid comment
|
|
|
140d58 |
|
|
|
140d58 |
virt-viewer by default chooses the VM by its id, then uuid
|
|
|
140d58 |
and then by name. Adjust the comment to match the implementation.
|
|
|
140d58 |
|
|
|
140d58 |
Related: rhbz#1399077
|
|
|
140d58 |
---
|
|
|
140d58 |
man/virt-viewer.pod | 2 +-
|
|
|
140d58 |
src/virt-viewer.c | 6 +++---
|
|
|
140d58 |
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
140d58 |
|
|
|
140d58 |
diff --git a/man/virt-viewer.pod b/man/virt-viewer.pod
|
|
|
140d58 |
index 30af8db..8463eb4 100644
|
|
|
140d58 |
--- a/man/virt-viewer.pod
|
|
|
140d58 |
+++ b/man/virt-viewer.pod
|
|
|
140d58 |
@@ -5,7 +5,7 @@ virt-viewer - display the graphical console for a virtual machine
|
|
|
140d58 |
|
|
|
140d58 |
=head1 SYNOPSIS
|
|
|
140d58 |
|
|
|
140d58 |
-B<virt-viewer> [OPTIONS] [DOMAIN-NAME|ID|UUID]
|
|
|
140d58 |
+B<virt-viewer> [OPTIONS] [ID|UUID|DOMAIN-NAME]
|
|
|
140d58 |
|
|
|
140d58 |
=head1 DESCRIPTION
|
|
|
140d58 |
|
|
|
140d58 |
diff --git a/src/virt-viewer.c b/src/virt-viewer.c
|
|
|
140d58 |
index 22a952a..65c0546 100644
|
|
|
140d58 |
--- a/src/virt-viewer.c
|
|
|
140d58 |
+++ b/src/virt-viewer.c
|
|
|
140d58 |
@@ -142,7 +142,7 @@ virt_viewer_add_option_entries(VirtViewerApp *self, GOptionContext *context, GOp
|
|
|
140d58 |
{ "uuid", '\0', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, opt_domain_selection_cb,
|
|
|
140d58 |
N_("Select the virtual machine only by its uuid"), NULL },
|
|
|
140d58 |
{ G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_STRING_ARRAY, &opt_args,
|
|
|
140d58 |
- NULL, "-- DOMAIN-NAME|ID|UUID" },
|
|
|
140d58 |
+ NULL, "-- ID|UUID|DOMAIN-NAME" },
|
|
|
140d58 |
{ NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL }
|
|
|
140d58 |
};
|
|
|
140d58 |
|
|
|
140d58 |
@@ -166,7 +166,7 @@ virt_viewer_local_command_line (GApplication *gapp,
|
|
|
140d58 |
|
|
|
140d58 |
if (opt_args) {
|
|
|
140d58 |
if (g_strv_length(opt_args) != 1) {
|
|
|
140d58 |
- g_printerr(_("\nUsage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n\n"), PACKAGE);
|
|
|
140d58 |
+ g_printerr(_("\nUsage: %s [OPTIONS] [ID|UUID|DOMAIN-NAME]\n\n"), PACKAGE);
|
|
|
140d58 |
ret = TRUE;
|
|
|
140d58 |
*status = 1;
|
|
|
140d58 |
goto end;
|
|
|
140d58 |
@@ -178,7 +178,7 @@ virt_viewer_local_command_line (GApplication *gapp,
|
|
|
140d58 |
|
|
|
140d58 |
if (opt_waitvm || domain_selection_type != DOMAIN_SELECTION_DEFAULT) {
|
|
|
140d58 |
if (!self->priv->domkey) {
|
|
|
140d58 |
- g_printerr(_("\nNo DOMAIN-NAME|ID|UUID was specified for '%s'\n\n"),
|
|
|
140d58 |
+ g_printerr(_("\nNo ID|UUID|DOMAIN-NAME was specified for '%s'\n\n"),
|
|
|
140d58 |
opt_waitvm ? "--wait" : domain_selection_to_opt[domain_selection_type]);
|
|
|
140d58 |
ret = TRUE;
|
|
|
140d58 |
*status = 1;
|
|
|
140d58 |
--
|
|
|
140d58 |
2.12.0
|
|
|
140d58 |
|