From b5d5accd7732af79889e370ee9cf62dcb0080d01 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Thu, 16 Nov 2023 00:05:46 +0100 Subject: [PATCH] Keep the VENDOR in motd after the update --- lib/functions/bsp/armbian-bsp-cli-deb.sh | 1 - packages/bsp/common/etc/update-motd.d/10-armbian-header | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/functions/bsp/armbian-bsp-cli-deb.sh b/lib/functions/bsp/armbian-bsp-cli-deb.sh index 7c89d56818..8d5d55ec86 100644 --- a/lib/functions/bsp/armbian-bsp-cli-deb.sh +++ b/lib/functions/bsp/armbian-bsp-cli-deb.sh @@ -108,7 +108,6 @@ function compile_armbian-bsp-cli() { VENDORURL="$VENDORURL" VENDORSUPPORT="$VENDORSUPPORT" VENDORBUGS="$VENDORBUGS" - EOF # copy general overlay from packages/bsp-cli 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 edbe214e35..9d8ac46633 100755 --- a/packages/bsp/common/etc/update-motd.d/10-armbian-header +++ b/packages/bsp/common/etc/update-motd.d/10-armbian-header @@ -12,7 +12,16 @@ THIS_SCRIPT="header" MOTD_DISABLE="" +# Read image configuration +[[ -f /etc/armbian-image-release ]] && . /etc/armbian-image-release +VENDORTEMP="${VENDOR}" + +# Read update configuration [[ -f /etc/armbian-release ]] && . /etc/armbian-release + +# Keep the VENDOR from image if its defined there +[[ -n "${VENDORTEMP}" && "${VENDORTEMP}" != "${VENDOR}" ]] && VENDOR="${VENDORTEMP}" + if [[ -f /etc/armbian-distribution-status ]]; then . /etc/armbian-distribution-status [[ -f /etc/lsb-release ]] && DISTRIBUTION_CODENAME=$(grep CODENAME /etc/lsb-release | cut -d"=" -f2)