From bc331a6d8268fe503b21656be24bbf13e5714222 Mon Sep 17 00:00:00 2001 From: Igor Date: Wed, 19 Feb 2025 16:00:24 +0100 Subject: [PATCH] Update packages/bsp/common/etc/update-motd.d/10-armbian-header Co-authored-by: Fridtjof Mund --- packages/bsp/common/etc/update-motd.d/10-armbian-header | 2 +- packages/bsp/common/usr/lib/armbian/armbian-firstrun | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/bsp/common/etc/update-motd.d/10-armbian-header b/packages/bsp/common/etc/update-motd.d/10-armbian-header index 076b8131cb..e41a4e1e35 100755 --- a/packages/bsp/common/etc/update-motd.d/10-armbian-header +++ b/packages/bsp/common/etc/update-motd.d/10-armbian-header @@ -94,7 +94,7 @@ echo -e "\e[1;91m$(figlet -f small " $VENDOR")\e[0m"; # Read RPI model from cpuinfo if [[ $BOARD == rpi4b ]]; then -BOARD_NAME=$(grep "Model" /proc/cpuinfo | sed -E 's/^Rev //; s/ Rev [0-9.]+$//' | cut -d":" -f2 | xargs) +BOARD_NAME=$(cat /proc/device-tree/model | tr '\0' '\n' | sed -E 's/ Rev [0-9.]+$//') fi # Display version, board, and kernel version diff --git a/packages/bsp/common/usr/lib/armbian/armbian-firstrun b/packages/bsp/common/usr/lib/armbian/armbian-firstrun index 97fe5cdaea..e50131dfad 100755 --- a/packages/bsp/common/usr/lib/armbian/armbian-firstrun +++ b/packages/bsp/common/usr/lib/armbian/armbian-firstrun @@ -110,8 +110,8 @@ case "$1" in [[ "${BOARD}" == nanopi-r6* ]] && set_fixed_mac # adjust hostname for rpi's - if [[ "${BOARD}" == rpi4b && "$(cat /etc/hostname)" == rpi4b ]]; then - BOARD_NAME=$(grep "Model" /proc/cpuinfo | sed -E 's/^Rev //; s/ Rev [0-9.]+$//' | cut -d":" -f2 | xargs) + if [[ "${BOARD}" == rpi4b && "$(hostname)" == rpi4b ]]; then + BOARD_NAME=$(cat /proc/device-tree/model | tr '\0' '\n' | sed -E 's/ Rev [0-9.]+$//') [[ "$BOARD_NAME" == *"Zero 2 W"* ]] && NEW_HOSTNAME="rpizero2w" [[ "$BOARD_NAME" == *"Pi 5 Model B"* ]] && NEW_HOSTNAME="rpi5b" [[ "$BOARD_NAME" == *"Pi 3 Model B"* ]] && NEW_HOSTNAME="rpi3b"