From 58ed41d38547fed3085b2b837b338f0095dae879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Thu, 27 Oct 2022 18:51:58 +0200 Subject: [PATCH] Fix two small cosmetic bug (#4357) - debian showed not supported due to absence of lsb-release - motd didn't address displaying update aval correct --- packages/bsp/common/etc/update-motd.d/40-armbian-updates | 2 +- packages/bsp/common/usr/lib/armbian/armbian-firstlogin | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/bsp/common/etc/update-motd.d/40-armbian-updates b/packages/bsp/common/etc/update-motd.d/40-armbian-updates index 1321d54d7a..24965fcb57 100755 --- a/packages/bsp/common/etc/update-motd.d/40-armbian-updates +++ b/packages/bsp/common/etc/update-motd.d/40-armbian-updates @@ -32,7 +32,7 @@ if [[ $NUM_UPDATES_ONHOLD -gt 0 ]] && grep -q linux /var/cache/apt/archives/upda echo -en "\e[31mKernel and firmware upgrades disabled:\e[0m \e[1marmbian-config\e[0m " fi -if [[ $NUM_UPDATES -gt 0 ]] || [[ $NUM_UPDATES_ONHOLD -gt 0 ]]; then +if [[ $NUM_UPDATES -gt 0 ]] && [[ $NUM_UPDATES_ONHOLD -gt 0 ]]; then echo -e "]" echo -e "Last check: \e[92m$DATE\e[0m" echo diff --git a/packages/bsp/common/usr/lib/armbian/armbian-firstlogin b/packages/bsp/common/usr/lib/armbian/armbian-firstlogin index c612a266fa..9648c922b7 100755 --- a/packages/bsp/common/usr/lib/armbian/armbian-firstlogin +++ b/packages/bsp/common/usr/lib/armbian/armbian-firstlogin @@ -8,6 +8,8 @@ # read distribution status [[ -f /etc/lsb-release ]] && . /etc/lsb-release +[[ -f /etc/os-release ]] && . /etc/os-release +[[ -z "$DISTRIB_CODENAME" ]] && DISTRIB_CODENAME="${VERSION_CODENAME}" [[ -n "$DISTRIB_CODENAME" && -f /etc/armbian-distribution-status ]] && DISTRIBUTION_STATUS=$(grep "$DISTRIB_CODENAME" /etc/armbian-distribution-status | cut -d"=" -f2) . /etc/armbian-release