From fa3c7e9dcd5d25a8c51741e183a4c26318fa7b83 Mon Sep 17 00:00:00 2001 From: ThomasKaiser Date: Mon, 18 Sep 2017 09:19:11 +0200 Subject: [PATCH] Minor logging fix and temp source adjustment https://forum.armbian.com/index.php?/topic/5169-tinker-board-thermals-broken-post-4120/&tab=comments#comment-39566 --- packages/bsp/common/etc/init.d/armhwinfo | 7 +++---- packages/bsp/common/etc/init.d/resize2fs | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/bsp/common/etc/init.d/armhwinfo b/packages/bsp/common/etc/init.d/armhwinfo index 263ae67c2a..9c88d2795f 100755 --- a/packages/bsp/common/etc/init.d/armhwinfo +++ b/packages/bsp/common/etc/init.d/armhwinfo @@ -61,9 +61,8 @@ prepare_temp_monitoring() { # sun7i legacy ln -fs /sys/devices/platform/a20-tp-hwmon/temp1_input /etc/armbianmonitor/datasources/soctemp else - # all other boards/kernels use the same sysfs node, only one board differs with all kernels: - # RK3288/rockchip: here thermal_zone1 is cpu, thermal_zone2 is gpu_thermal. - [[ ${LINUXFAMILY} == rockchip ]] && THERMAL_ZONE="thermal_zone1" || THERMAL_ZONE="thermal_zone0" + # all other boards/kernels use the same sysfs node except of Actions Semi S500: + [[ ${LINUXFAMILY} == s500 ]] && THERMAL_ZONE="thermal_zone1" || THERMAL_ZONE="thermal_zone0" ln -fs /sys/devices/virtual/thermal/${THERMAL_ZONE}/temp /etc/armbianmonitor/datasources/soctemp fi } # prepare_temp_monitoring @@ -266,7 +265,7 @@ log_hardware_info() { echo -e "\n\n\n$(date) | ${BOARD_NAME} | ${$VERSION} | ${DISTRO_ARCH} | ${CPU_ARCH} | ${KERNELID}" >>${Log} else echo "$(date) | ${BOARD_NAME} | ${$VERSION} | ${DISTRO_ARCH} | ${CPU_ARCH} | ${KERNELID}" >>${Log} - chmod 755 ${Log} + chmod 644 ${Log} fi echo -e "\n### dmesg:\n" >>${Log} cat "${TMPFILE}" >>${Log} diff --git a/packages/bsp/common/etc/init.d/resize2fs b/packages/bsp/common/etc/init.d/resize2fs index 00d72f4baf..0c3abf0f6c 100755 --- a/packages/bsp/common/etc/init.d/resize2fs +++ b/packages/bsp/common/etc/init.d/resize2fs @@ -151,7 +151,7 @@ case "$1" in DISTRO_ARCH=$(dpkg --print-architecture) KERNELID=$(uname -r) echo "$(date) | ${BOARD_NAME} | ${$VERSION} | ${DISTRO_ARCH} | ${CPU_ARCH} | ${KERNELID}" >>${Log} - chmod 755 ${Log} + chmod 644 ${Log} rootfstype=$(findmnt -n -o FSTYPE /) rootpart=$(findmnt -n -o SOURCE /) # i.e. /dev/mmcblk0p1