Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UX / cosmetics: MOTD ip display needs some limiting #7798

Merged
merged 2 commits into from
Feb 8, 2025
Merged

UX / cosmetics: MOTD ip display needs some limiting #7798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7901e1b
UX / cosmetics: MOTD ip display needs some limiting
igorpecovnik Feb 8, 2025
a1045c9
Show running Docker containers in the MOTD
igorpecovnik Feb 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/bsp/common/etc/cron.daily/armbian-quotes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

curl --max-time 2 -L -s -o "/tmp/quotes.txt" "https://github.armbian.com/quotes.txt"
3 changes: 0 additions & 3 deletions packages/bsp/common/etc/cron.weekly/armbian-quotes
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions packages/bsp/common/etc/default/armbian-motd.dpkg-dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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|^vnet|^virbr"
PRIMARY_INTERFACE="$(ip route | grep '^default' | sed "s/.*dev //" | cut -d" " -f1)"
PRIMARY_DIRECTION="rx"
STORAGE=/dev/sda1
Expand Down
15 changes: 12 additions & 3 deletions packages/bsp/common/etc/update-motd.d/10-armbian-header
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

THIS_SCRIPT="header"
MOTD_DISABLE=""
HIDE_IP_PATTERN="^dummy0|^lo|^docker"
HIDE_IP_PATTERN="^dummy0|^lo|^docker|^hassio|^br-|^veth|^vnet|^virbr"

# Read image configuration
[[ -f /etc/armbian-image-release ]] && . /etc/armbian-image-release
Expand Down Expand Up @@ -76,8 +76,7 @@ function get_ip_addresses() {
[[ -n $ipv6 ]] && ipv6s+=("$ipv6")
fi
done

echo "${ipv4s[@]}|${ipv6s[@]}"
echo "${ipv4s[*]}|${ipv6s[*]}"
} # get_ip_addresses

# Read Armbian kernel version
Expand Down Expand Up @@ -134,6 +133,11 @@ if [[ $NUM_UPDATES -gt 0 ]]; then
UPDATE_STATUS+=" available for upgrade\e[0m "
fi

# read running Docker containers if any
if systemctl is-active docker >/dev/null; then
CONTAINERS_STATUS=$(docker ps --format "{{.Names}}" | tr '\n' ',' | sed 's/,/, /g' | sed 's/, $//')
fi

echo ""

# Display packages status
Expand All @@ -160,6 +164,11 @@ if [[ -n $wan_ip_address ]]; then
echo -e "\x1B[93m(WAN)\x1B[0m $wan_ip_address"
fi

# Display running docker containers
if [[ -n "${CONTAINERS_STATUS}" ]]; then
echo -e " Containers: \x1B[92m$CONTAINERS_STATUS\x1B[0m"
fi

# Display hostapd
if [[ -n $ssid ]]; then
echo -e " WiFi AP: SSID: (\x1B[91m$ssid\x1B[0m), $(iw $interface info | grep channel | xargs)"
Expand Down
4 changes: 2 additions & 2 deletions packages/bsp/common/etc/update-motd.d/30-armbian-sysinfo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading