|
 |
7ed5e3 |
From 6aec975c07d60a2518d3f16ee91db1d03a704882 Mon Sep 17 00:00:00 2001
|
|
|
7ed5e3 |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
7ed5e3 |
Date: Thu, 30 Jul 2020 14:01:48 +0100
|
|
|
7ed5e3 |
Subject: [PATCH] v2v: Use common documentation for --keys-from-stdin.
|
|
|
7ed5e3 |
|
|
|
7ed5e3 |
(cherry picked from commit 3f9b5f26398694a8a496eae85525e3be5c4b9cca)
|
|
|
7ed5e3 |
---
|
|
|
7ed5e3 |
common | 2 +-
|
|
|
7ed5e3 |
docs/virt-v2v.pod | 11 ++++-------
|
|
|
7ed5e3 |
2 files changed, 5 insertions(+), 8 deletions(-)
|
|
|
7ed5e3 |
|
|
|
7ed5e3 |
Submodule common be42b0b8..5ea1baec:
|
|
|
7ed5e3 |
diff --git a/common/options/Makefile.am b/common/options/Makefile.am
|
|
|
7ed5e3 |
index b38fedc..f7ea749 100644
|
|
|
7ed5e3 |
--- a/common/options/Makefile.am
|
|
|
7ed5e3 |
+++ b/common/options/Makefile.am
|
|
|
7ed5e3 |
@@ -19,6 +19,7 @@ include $(top_srcdir)/subdir-rules.mk
|
|
|
7ed5e3 |
|
|
|
7ed5e3 |
EXTRA_DIST = \
|
|
|
7ed5e3 |
key-option.pod \
|
|
|
7ed5e3 |
+ keys-from-stdin-option.pod \
|
|
|
7ed5e3 |
blocksize-option.pod
|
|
|
7ed5e3 |
|
|
|
7ed5e3 |
# liboptions.la contains guestfish code which is used in other
|
|
|
7ed5e3 |
diff --git a/common/options/keys-from-stdin-option.pod b/common/options/keys-from-stdin-option.pod
|
|
|
7ed5e3 |
new file mode 100644
|
|
|
7ed5e3 |
index 0000000..03c5339
|
|
|
7ed5e3 |
--- /dev/null
|
|
|
7ed5e3 |
+++ b/common/options/keys-from-stdin-option.pod
|
|
|
7ed5e3 |
@@ -0,0 +1,4 @@
|
|
|
7ed5e3 |
+=item B<--keys-from-stdin>
|
|
|
7ed5e3 |
+
|
|
|
7ed5e3 |
+Read key or passphrase parameters from stdin. The default is
|
|
|
7ed5e3 |
+to try to read passphrases from the user by opening F</dev/tty>.
|
|
|
7ed5e3 |
diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
|
|
|
7ed5e3 |
index a00fa8af..74934eb4 100644
|
|
|
7ed5e3 |
--- a/docs/virt-v2v.pod
|
|
|
7ed5e3 |
+++ b/docs/virt-v2v.pod
|
|
|
7ed5e3 |
@@ -382,14 +382,11 @@ through VDDK.
|
|
|
7ed5e3 |
|
|
|
7ed5e3 |
__INCLUDE:key-option.pod__
|
|
|
7ed5e3 |
|
|
|
7ed5e3 |
-=item B<--keys-from-stdin>
|
|
|
7ed5e3 |
+__INCLUDE:keys-from-stdin-option.pod__
|
|
|
7ed5e3 |
|
|
|
7ed5e3 |
-Read key or passphrase parameters from stdin. The default is
|
|
|
7ed5e3 |
-to try to read passphrases from the user by opening F</dev/tty>.
|
|
|
7ed5e3 |
-
|
|
|
7ed5e3 |
-Note this options only applies to keys and passphrases for encrypted
|
|
|
7ed5e3 |
-devices and partitions, not for passwords used to connect to remote
|
|
|
7ed5e3 |
-servers.
|
|
|
7ed5e3 |
+Note I<--keys-from-stdin> only applies to keys and passphrases for
|
|
|
7ed5e3 |
+encrypted devices and partitions, not for passwords used to connect to
|
|
|
7ed5e3 |
+remote servers.
|
|
|
7ed5e3 |
|
|
|
7ed5e3 |
=item B<--mac> aa:bb:cc:dd:ee:ffB<:network:>out
|
|
|
7ed5e3 |
|
|
|
7ed5e3 |
--
|
|
|
7ed5e3 |
2.18.4
|
|
|
7ed5e3 |
|