From 0590bbba2d17b9153640c8bf0fb7e63b266191b2 Mon Sep 17 00:00:00 2001 From: RD WebDesign Date: Thu, 9 Jan 2025 18:06:06 -0300 Subject: [PATCH] Skip some checks in docker container These commands always fail in containers with "command not found" (as expected). Signed-off-by: RD WebDesign --- advanced/Scripts/piholeDebug.sh | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/advanced/Scripts/piholeDebug.sh b/advanced/Scripts/piholeDebug.sh index 1307382c..b2ae94ee 100755 --- a/advanced/Scripts/piholeDebug.sh +++ b/advanced/Scripts/piholeDebug.sh @@ -492,13 +492,25 @@ run_and_print_command() { } hardware_check() { + # Note: the checks are skipped if Pi-hole is running in a docker container + + local skip_msg="${INFO} Not enough permissions inside Docker container ${COL_YELLOW}(skipped)${COL_NC}" + echo_current_diagnostic "System hardware configuration" - # Store the output of the command in a variable - run_and_print_command "lshw -short" + if [ -n "${DOCKER_VERSION}" ]; then + log_write "${skip_msg}" + else + # Store the output of the command in a variable + run_and_print_command "lshw -short" + fi echo_current_diagnostic "Processor details" - # Store the output of the command in a variable - run_and_print_command "lscpu" + if [ -n "${DOCKER_VERSION}" ]; then + log_write "${skip_msg}" + else + # Store the output of the command in a variable + run_and_print_command "lscpu" + fi } disk_usage() {