Fixes #36969 - return the actual exit status of registration command

theforeman · Dec 11, 2023 · c894786 · c894786
1 parent d48325f
commit c894786
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/controllers/concerns/foreman/controller/registration_commands.rb b/app/controllers/concerns/foreman/controller/registration_commands.rb
@@ -5,7 +5,7 @@ module Foreman::Controller::RegistrationCommands
 
   def command
     args_query = "?#{registration_args.to_query}"
-    "curl -sS #{insecure} '#{registration_url(@smart_proxy)}#{args_query if args_query != '?'}' #{command_headers} | bash"
+    "output=$(curl -sS #{insecure} '#{registration_url(@smart_proxy)}#{args_query if args_query != '?'}' #{command_headers}) && echo \"$output\" | bash"
   end
 
   def registration_args

diff --git a/app/views/unattended/provisioning_templates/registration/global_registration.erb b/app/views/unattended/provisioning_templates/registration/global_registration.erb
@@ -152,4 +152,4 @@ register_katello_host | bash
 register_host | bash
 <% end -%>
 
-cleanup_and_exit
+cleanup_and_exit $?