From 6ad0e6b7a121866b3bbd6ec27744d35354ce0b47 Mon Sep 17 00:00:00 2001 From: cronyx Date: Fri, 5 May 2023 18:58:33 +0300 Subject: [PATCH] requested improvements --- general/overlay/etc/init.d/S70vendor | 14 +++++++++----- general/overlay/usr/sbin/extutils | 5 +---- .../ingenic-osdrv-t31/files/script/load_ingenic | 10 +++++++--- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/general/overlay/etc/init.d/S70vendor b/general/overlay/etc/init.d/S70vendor index 1b256524..9e819094 100755 --- a/general/overlay/etc/init.d/S70vendor +++ b/general/overlay/etc/init.d/S70vendor @@ -3,12 +3,16 @@ # load vendor specific drivers # vendor=$(ipcinfo -v) +status=$(check_mac) + +log_vendor() { + logger -s -p daemon.info -t ${vendor} "$1" +} case "$1" in start) - logger -s -p daemon.info -t ${vendor} "Check MAC for ${vendor} devices..." - logger -s -p daemon.info -t ${vendor} "$(check_mac)" - echo -e '\nLoading of kernel modules...' - load_${vendor} -i - ;; + [ -n "${status}" ] && log_vendor "${status}" + echo -e '\nLoading of kernel modules...' + load_${vendor} -i + ;; esac diff --git a/general/overlay/usr/sbin/extutils b/general/overlay/usr/sbin/extutils index eac337c6..42bb4ab9 100755 --- a/general/overlay/usr/sbin/extutils +++ b/general/overlay/usr/sbin/extutils @@ -27,11 +27,8 @@ case "${CMD}" in ;; check_mac) if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then - status="The eth0 interface has a lousy MAC, please change it.." - else - status="The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)" + echo "Warning. Wired network interface has default MAC address, please change it." fi - echo ${status} ;; *) ;; diff --git a/general/package/ingenic-osdrv-t31/files/script/load_ingenic b/general/package/ingenic-osdrv-t31/files/script/load_ingenic index 0b69fc58..e53d58c4 100755 --- a/general/package/ingenic-osdrv-t31/files/script/load_ingenic +++ b/general/package/ingenic-osdrv-t31/files/script/load_ingenic @@ -9,6 +9,10 @@ fi echo 1 >/proc/sys/vm/overcommit_memory +log_vendor() { + logger -s -p daemon.info -t ${vendor} "$1" +} + check_return() { if [ $? -ne 0 ]; then echo err: $1 @@ -47,7 +51,7 @@ fi if fw_printenv -n sensor >/dev/null; then export SENSOR=$(fw_printenv -n sensor) - logger -s -p daemon.info -t ${vendor} "Get data from environment and set SENSOR as ${SENSOR}" + log_vendor "Get data from environment and set SENSOR as ${SENSOR}" else echo 1 >/proc/jz/sinfo/info check_return "start sinfo" @@ -58,8 +62,8 @@ else unset SENSOR fw_setenv sensor else - logger -s -p daemon.info -t ${vendor} "Get data from sinfo and set SENSOR as ${SENSOR}" - fw_setenv sensor $SENSOR && logger -s -p daemon.info -t ${vendor} "Write detected ${SENSOR} to U-Boot ENV" + log_vendor "Get data from sinfo and set SENSOR as ${SENSOR}" + fw_setenv sensor $SENSOR && log_vendor "Write detected ${SENSOR} to U-Boot ENV" fi fi