50 lines
2.2 KiB
Diff
50 lines
2.2 KiB
Diff
From 81a201269e5451cd76348e0da6d0ef4c0fb4c0dd Mon Sep 17 00:00:00 2001
|
|
From: Laszlo Ersek <lersek@redhat.com>
|
|
Date: Fri, 1 Jul 2022 15:30:42 +0200
|
|
Subject: [PATCH] convert: document networking dependency of "--key ID:clevis"
|
|
|
|
Virt-v2v enables appliance networking already, for the sake of
|
|
"unconfigure_vmware". We now have a second use case for networking: "--key
|
|
ID:clevis". Update the comment in the code.
|
|
|
|
(Short log for libguestfs-common commit range 35467027f657..af6cb55bc58a:
|
|
|
|
Laszlo Ersek (12):
|
|
options: fix UUID comparison logic bug in get_keys()
|
|
mltools/tools_utils: remove unused function "key_store_to_cli"
|
|
mltools/tools_utils: allow multiple "--key" options for OCaml tools too
|
|
options: replace NULL-termination with number-of-elements in get_keys()
|
|
options: wrap each passphrase from get_keys() into a struct
|
|
options: add back-end for LUKS decryption with Clevis+Tang
|
|
options: introduce selector type "key_clevis"
|
|
options: generalize "--key" selector parsing for C-language utilities
|
|
mltools/tools_utils-c: handle internal type error with abort()
|
|
mltools/tools_utils: generalize "--key" selector parsing for OCaml utils
|
|
options, mltools/tools_utils: parse "--key ID:clevis" options
|
|
options, mltools/tools_utils: add helper for network dependency
|
|
).
|
|
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1809453
|
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
Message-Id: <20220628115856.5820-1-lersek@redhat.com>
|
|
Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
|
|
(cherry picked from commit 98fa5ab2685371c681282ce5de704877af27be74)
|
|
---
|
|
convert/convert.ml | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/convert/convert.ml b/convert/convert.ml
|
|
index 5e0e6c2b..b678dc92 100644
|
|
--- a/convert/convert.ml
|
|
+++ b/convert/convert.ml
|
|
@@ -57,7 +57,8 @@ let rec convert dir options source =
|
|
* sure this is not too large because each vCPU consumes guest RAM.
|
|
*)
|
|
g#set_smp (min 8 (Sysconf.nr_processors_online ()));
|
|
- (* The network is only used by the unconfigure_vmware () function. *)
|
|
+ (* The network is used by the unconfigure_vmware () function, and the "--key
|
|
+ * ID:clevis" command line options (if any). *)
|
|
g#set_network true;
|
|
List.iter (
|
|
fun { s_disk_id = i } ->
|