From c1c200727222296da2f028f267653df84cd32715 Mon Sep 17 00:00:00 2001
From: Alexandre MERLIN <alexandre.merlin@inria.fr>
Date: Thu, 25 Nov 2021 10:35:38 +0100
Subject: [PATCH] [bin/kareboot] default key should only be used for
"deploy_env" reboot kind
---
bin/kareboot3 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/kareboot3 b/bin/kareboot3
index e7bf7a7e..18934320 100755
--- a/bin/kareboot3
+++ b/bin/kareboot3
@@ -89,7 +89,7 @@ class KarebootClient < ClientWorkflow
return false
end
unless options[:deploy_part]
- error("A partition number must be specified must be with the recorded_env kind of reboot")
+ error("A partition label must be specified must be with the recorded_env kind of reboot")
return false
end
end
@@ -171,7 +171,7 @@ class KarebootClient < ClientWorkflow
# Check if the environment contains local files
- options[:key] = options[:default_config_options][:key] if options[:key].nil? && options[:default_config_options][:key]
+ options[:key] = options[:default_config_options][:key] if options[:key].nil? && options[:default_config_options][:key] && options[:operation] == :deploy_env
options.delete(:key) if options[:key] == 'none'
if options[:key]
params[:ssh_authorized_keys] = load_keyfile(options[:key])
--
GitLab