Skip to content

Commit 5bf0164

Browse files
authored
Update collect-debug-logs script to include userland architecture (#1611)
Related https://github.com/tiny-pilot/tinypilot-pro/issues/1030. Raspberry Pi OS now updates the kernel on 32-bit installations to the 64-bit kernel while simultaneously keeping the userland as 32-bit, which means that it isn't possible to accurately determine if the user is running a 64-bit system based on the output of `uname --all`. This change adds additional information to the `collect-debug-logs` script, allowing us to detect when a user is running TinyPilot on an unsupported architecture. It also slightly reformats the relevant section for readability. <a data-ca-tag href="https://codeapprove.com/pr/tiny-pilot/tinypilot/1611"><img src="https://codeapprove.com/external/github-tag-allbg.png" alt="Review on CodeApprove" /></a>
1 parent 550619e commit 5bf0164

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

debian-pkg/opt/tinypilot-privileged/scripts/collect-debug-logs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,17 @@ cd /opt/tinypilot && \
7171

7272
print_info "Checking uStreamer version..."
7373
cd /opt/ustreamer && \
74-
printf "uStreamer version: %s\n" "$(/opt/ustreamer/ustreamer --version)" >> "${LOG_FILE}"
74+
printf "uStreamer version: %s\n\n" "$(/opt/ustreamer/ustreamer --version)" \
75+
>> "${LOG_FILE}"
7576

76-
print_info "Checking OS version..."
77+
echo "System information" >> "${LOG_FILE}"
78+
79+
print_info "Checking system information..."
7780
{
7881
printf "OS version: %s\n" "$(uname --all)"
82+
printf "Kernel architecture: %s\n" "$(uname --machine)"
83+
printf "Userland architecture: %s (%s)\n" "$(dpkg --print-architecture)" \
84+
"$(getconf LONG_BIT)-bit"
7985
printf "Distribution name: %s\n" "$(lsb_release --id --short)"
8086
printf "Distribution version: %s\n" "$(lsb_release --release --short)"
8187
printf "\n"

0 commit comments

Comments
 (0)