wbrawner/distribution
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #899 from fewtarius/dev

Browse source 
Re-order network restart/wifi start, and fix jelos-info reporting.
This commit is contained in:
fewtarius 2023-01-03 06:43:36 -05:00 committed by GitHub
commit 37184af754
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
packages/jelos/sources/scripts/jelos-info
View file

@ -42,31 +42,36 @@ do
fi
done
declare -a CF MF
CNTR=0
for CPUFREQ in /sys/devices/system/cpu/cpufreq/*
do
if [[ "${CPUFREQ}" =~ boost ]]
then
continue
fi
if [ "${CNTR}" -eq 0 ]
then
CF+=("CURRENT FREQUENCY:")
MF+=("MAXIMUM FREQUENCY:")
fi
RELCPUS=$(cat ${CPUFREQ}/related_cpus)
if [ "${#RELCPUS}" -gt 1 ]
then
FIELD="$(cat ${CPUFREQ}/related_cpus 2>/dev/null | awk '{print $1"-"$NF}')"
else
FIELD="$(cat ${CPUFREQ}/related_cpus)"
fi
CF+=("CORES ${FIELD}: $(( $(cat ${CPUFREQ}/scaling_cur_freq | sort | tail -n 1) / 1000))MHz")
MF+=("CORES ${FIELD}: $(( $(cat ${CPUFREQ}/scaling_max_freq | sort | tail -n 1) / 1000))MHz")
CNTR=$(( CNTR + 1 ))
done
case ${HW_ARCH} in
aarch64)
declare -a CF MF
CNTR=0
for CPUFREQ in /sys/devices/system/cpu/cpufreq/*
do
if [[ "${CPUFREQ}" =~ boost ]]
then
continue
fi
if [ "${CNTR}" -eq 0 ]
then
CF+=("CURRENT FREQUENCY:")
MF+=("MAXIMUM FREQUENCY:")
fi
RELCPUS=$(cat ${CPUFREQ}/related_cpus)
if [ "${#RELCPUS}" -gt 1 ]
then
FIELD="$(cat ${CPUFREQ}/related_cpus 2>/dev/null | awk '{print $1"-"$NF}')"
else
FIELD="$(cat ${CPUFREQ}/related_cpus)"
fi
CF+=("CORES ${FIELD}: $(( $(cat ${CPUFREQ}/scaling_cur_freq | sort | tail -n 1) / 1000))MHz")
MF+=("CORES ${FIELD}: $(( $(cat ${CPUFREQ}/scaling_max_freq | sort | tail -n 1) / 1000))MHz")
CNTR=$(( CNTR + 1 ))
done
;;
esac
# temperature
# Unit: millidegree Celsius
@ -111,11 +116,15 @@ then
fi
echo "CPU FAN: ${FANSPEED}"
fi
for C in "${CF[@]}"
do
echo ${C}
done
for M in "${MF[@]}"
do
echo ${M}
done
case ${HW_ARCH} in
aarch64)
for C in "${CF[@]}"
do
echo ${C}
done
for M in "${MF[@]}"
do
echo ${M}
done
;;
esac

14
packages/sysutils/autostart/sources/common/008-network
View file

@ -8,12 +8,10 @@ HOSTNAME=$(get_setting system.hostname)
hostname ${HOSTNAME}
avahi-set-host-name ${HOSTNAME}
if [ "$(get_setting internal.wifi)" == 0 ] && [ "${DEVICE_INTERNAL_WIFI}" = true ]
NETCHECK=$(systemctl status connman >/dev/null 2>&1)
if [ "$?" = "0" ]
then
nohup rmmod ${DEVICE_WIFI_MODULE} &
exit 0
else
set_setting internal.wifi 1
systemctl restart connman
fi
if [ "$(get_setting wifi.enabled)" == "0" ] || [ "$1" == "disable" ]
@ -23,9 +21,3 @@ elif [ "$(get_setting wifi.enabled)" == "1" ] || [ "$1" == "enable" ]
then
nohup wifictl enable &
fi
NETCHECK=$(systemctl status connman >/dev/null 2>&1)
if [ "$?" = "0" ]
then
systemctl restart connman
fi