From 287853f460d675e80233309f432167ea1f5f757b Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Sat, 8 Feb 2025 11:32:16 +0100 Subject: [PATCH] UX / cosmetics: MOTD ip display needs some limiting - switch MOTD download to new central location https://github.armbian.com/ - move cronjob for MOTD download from weekly to daily - change mord defaults, remove clear from defaults --- packages/bsp/common/etc/cron.daily/armbian-quotes | 3 +++ packages/bsp/common/etc/cron.weekly/armbian-quotes | 3 --- packages/bsp/common/etc/default/armbian-motd.dpkg-dist | 4 ++-- packages/bsp/common/etc/update-motd.d/10-armbian-header | 2 +- packages/bsp/common/etc/update-motd.d/30-armbian-sysinfo | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) create mode 100755 packages/bsp/common/etc/cron.daily/armbian-quotes delete mode 100755 packages/bsp/common/etc/cron.weekly/armbian-quotes diff --git a/packages/bsp/common/etc/cron.daily/armbian-quotes b/packages/bsp/common/etc/cron.daily/armbian-quotes new file mode 100755 index 0000000000..f7958c558f --- /dev/null +++ b/packages/bsp/common/etc/cron.daily/armbian-quotes @@ -0,0 +1,3 @@ +#!/bin/bash + +curl --max-time 2 -L -s -o "/tmp/quotes.txt" "https://github.armbian.com/quotes.txt" diff --git a/packages/bsp/common/etc/cron.weekly/armbian-quotes b/packages/bsp/common/etc/cron.weekly/armbian-quotes deleted file mode 100755 index 0d7ec031a0..0000000000 --- a/packages/bsp/common/etc/cron.weekly/armbian-quotes +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -curl -L -s -o "/etc/update-motd.d/quotes.txt" "https://dl.armbian.com/quotes.txt" diff --git a/packages/bsp/common/etc/default/armbian-motd.dpkg-dist b/packages/bsp/common/etc/default/armbian-motd.dpkg-dist index 612c6982e8..40d1811d5b 100644 --- a/packages/bsp/common/etc/default/armbian-motd.dpkg-dist +++ b/packages/bsp/common/etc/default/armbian-motd.dpkg-dist @@ -4,9 +4,9 @@ # ONE_WIRE="yes" show 1-wire temperature sensor if attached # PRIMARY_DIRECTION="rx" show daily traffic stats, options: "rx", "tx", "both", "off", vnstat needs to be installed -MOTD_DISABLE="" +MOTD_DISABLE="clear" ONE_WIRE="" -HIDE_IP_PATTERN="^dummy0|^lo|^docker|^hassio" +HIDE_IP_PATTERN="^dummy0|^lo|^docker|^hassio|^br-|^veth" PRIMARY_INTERFACE="$(ip route | grep '^default' | sed "s/.*dev //" | cut -d" " -f1)" PRIMARY_DIRECTION="rx" STORAGE=/dev/sda1 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 df947c2d56..f5c8ebe470 100755 --- a/packages/bsp/common/etc/update-motd.d/10-armbian-header +++ b/packages/bsp/common/etc/update-motd.d/10-armbian-header @@ -11,7 +11,7 @@ THIS_SCRIPT="header" MOTD_DISABLE="" -HIDE_IP_PATTERN="^dummy0|^lo|^docker" +HIDE_IP_PATTERN="^dummy0|^lo|^docker|^hassio|^br-|^veth" # Read image configuration [[ -f /etc/armbian-image-release ]] && . /etc/armbian-image-release diff --git a/packages/bsp/common/etc/update-motd.d/30-armbian-sysinfo b/packages/bsp/common/etc/update-motd.d/30-armbian-sysinfo index c796472178..b6f1255489 100755 --- a/packages/bsp/common/etc/update-motd.d/30-armbian-sysinfo +++ b/packages/bsp/common/etc/update-motd.d/30-armbian-sysinfo @@ -132,8 +132,8 @@ display " Memory usage" "$memory_usage" "70" "0" "%" " of ${memory_total}" display "Zram usage" "$swap_usage" "75" "0" "%" " of ${swap_total}" echo "" # fixed newline display " CPU temp" "$board_temp" $CPU_TEMP_LIMIT "0" "°C" "" -display "Ambient temp" "$amb_temp" $AMB_TEMP_LIMIT "0" "°C" "" -display "Usage of /" "$root_usage" "90" "1" "%" " of $root_total $overlay_root" +display " Ambient temp" "$amb_temp" $AMB_TEMP_LIMIT "0" "°C" "" +display " Usage of /" "$root_usage" "90" "1" "%" " of $root_total $overlay_root" if command -v overlayroot-chroot > /dev/null 2>&1 && findmnt -k /media/root-ro | tail -1 | grep -w /media/root-ro > /dev/null 2>&1; then echo -ne "\x1B[91m(read only rootfs)\x1B[0m" fi