From 40a37aa5c6ca5feb84ab3d57aa540e0fd6676153 Mon Sep 17 00:00:00 2001 From: "James O. D. Hunt" Date: Tue, 9 Jun 2020 09:12:36 +0100 Subject: [PATCH] runtime: Re-order funcs in data collection script Ensure functions defined before calling them in the data collection script. Signed-off-by: James O. D. Hunt --- src/runtime/data/kata-collect-data.sh.in | 38 ++++++++++++------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/runtime/data/kata-collect-data.sh.in b/src/runtime/data/kata-collect-data.sh.in index 2ab8ddb759..9886371c36 100644 --- a/src/runtime/data/kata-collect-data.sh.in +++ b/src/runtime/data/kata-collect-data.sh.in @@ -217,25 +217,6 @@ show_runtime_configs() separator } -show_log_details() -{ - heading "Logfiles" - - show_runtime_log_details - show_proxy_log_details - show_shim_log_details - show_throttler_log_details - - separator -} - -show_runtime_log_details() -{ - subheading "Runtime logs" - - find_system_journal_problems "runtime" "@RUNTIME_NAME@" "" -} - find_system_journal_problems() { local name="$1" @@ -268,6 +249,13 @@ show_proxy_log_details() find_system_journal_problems "proxy" "@PROJECT_TYPE@-proxy" "" } +show_runtime_log_details() +{ + subheading "Runtime logs" + + find_system_journal_problems "runtime" "@RUNTIME_NAME@" "" +} + show_shim_log_details() { subheading "Shim logs" @@ -282,6 +270,18 @@ show_throttler_log_details() find_system_journal_problems "throttler" "" "@PROJECT_TYPE@-ksm-throttler" } +show_log_details() +{ + heading "Logfiles" + + show_runtime_log_details + show_proxy_log_details + show_shim_log_details + show_throttler_log_details + + separator +} + show_package_versions() { heading "Packages"