diff --git a/.update/version b/.update/version index cfdca25b69..87969ec8ea 100644 --- a/.update/version +++ b/.update/version @@ -14,6 +14,15 @@ G_MIN_DEBIAN=6 # Alternative Git branch to automatically migrate to when Debian version is too low G_OLD_DEBIAN_BRANCH='8' # Live patches -G_LIVE_PATCH_DESC=() -G_LIVE_PATCH_COND=() -G_LIVE_PATCH=() +G_LIVE_PATCH_DESC=( + [0]='Fix Docker socket path for Portainer installation, only relevant if you plan to install/reinstall/update Portainer via dietpi-software' + [1]='Fix CPU frequency limit selection in dietpi-config' +) +G_LIVE_PATCH_COND=( + [0]='grep -q '\''/run/docker.sock:/run/docker.sock'\'' /boot/dietpi/dietpi-software' + [1]='grep -q '\''\[0-9\]\*scaling_available_frequencies'\'' /boot/dietpi/dietpi-config' +) +G_LIVE_PATCH=( + [0]='sed --follow-symlinks -i '\''s|/run/docker.sock:/run/docker.sock|/run/docker.sock:/var/run/docker.sock|'\'' /boot/dietpi/dietpi-software' + [1]='sed --follow-symlinks -i '\''s|\[0-9\]\*scaling_available_frequencies|\[0-9\]\*/scaling_available_frequencies|'\'' /boot/dietpi/dietpi-config' +) diff --git a/dietpi/dietpi-cpuinfo b/dietpi/dietpi-cpuinfo index 7ac31ebaf1..790efe0962 100755 --- a/dietpi/dietpi-cpuinfo +++ b/dietpi/dietpi-cpuinfo @@ -29,7 +29,10 @@ { for ((i=0; i<$G_HW_CPU_CORES; i++)) do - [[ -f /sys/devices/system/cpu/cpu$i/cpufreq/scaling_cur_freq ]] && read -r aCPU_CUR_FREQ["$i"] < "/sys/devices/system/cpu/cpu$i/cpufreq/scaling_cur_freq" + [[ -f /sys/devices/system/cpu/cpu$i/cpufreq/scaling_cur_freq ]] && { + sleep 0.05 # Necessary to give the scheduler a chance to scale down the core in (quite likely) case this script has already caused it to ramp up the frequency + read -r aCPU_CUR_FREQ["$i"] < "/sys/devices/system/cpu/cpu$i/cpufreq/scaling_cur_freq" + } [[ -f /sys/devices/system/cpu/cpu$i/cpufreq/scaling_min_freq ]] && read -r aCPU_MIN_FREQ["$i"] < "/sys/devices/system/cpu/cpu$i/cpufreq/scaling_min_freq" [[ -f /sys/devices/system/cpu/cpu$i/cpufreq/scaling_max_freq ]] && read -r aCPU_MAX_FREQ["$i"] < "/sys/devices/system/cpu/cpu$i/cpufreq/scaling_max_freq" done