diff --git a/files/initrd/opt/arc/arc-functions.sh b/files/initrd/opt/arc/arc-functions.sh index f40680bb..ca047834 100755 --- a/files/initrd/opt/arc/arc-functions.sh +++ b/files/initrd/opt/arc/arc-functions.sh @@ -2301,6 +2301,7 @@ function governorSelection () { [ "${PLATFORM}" != "epyc7002" ] && CPUGOVERNOR="ondemand" fi writeConfigKey "governor" "${CPUGOVERNOR}" "${USER_CONFIG_FILE}" + CPUGOVERNOR="$(readConfigKey "governor" "${USER_CONFIG_FILE}")" } ############################################################################### diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh index c113ec4f..bc917c4c 100755 --- a/files/initrd/opt/arc/arc.sh +++ b/files/initrd/opt/arc/arc.sh @@ -445,13 +445,6 @@ function arcSettings() { sleep 2 getmapSelection fi - # Check for CPU Frequency Scaling - if [ "${CPUFREQ}" == "true" ]; then - # Select Governor for DSM - dialog --backtitle "$(backtitle)" --colors --title "CPU Frequency Scaling" \ - --infobox "Generating Governor Table..." 3 40 - governorSelection - fi # Check for Custom Build if [ "${AUTOMATED}" == "false" ]; then # Select Addons @@ -940,7 +933,7 @@ else echo "e \"Version \" " >>"${TMP_PATH}/menu" echo "p \"Patch Options (SN/Mac) \" " >>"${TMP_PATH}/menu" if [ "${CPUFREQ}" == "true" ]; then - echo "g \"Frequency Scaling \" " >>"${TMP_PATH}/menu" + echo "g \"Frequency Scaling Governor\" " >>"${TMP_PATH}/menu" fi if [ "${DT}" == "false" ] && [ ${SATACONTROLLER} -gt 0 ]; then echo "S \"Sata PortMap \" " >>"${TMP_PATH}/menu" diff --git a/files/initrd/opt/arc/include/modulelist b/files/initrd/opt/arc/include/modulelist index 0eeb3678..1686d0bf 100644 --- a/files/initrd/opt/arc/include/modulelist +++ b/files/initrd/opt/arc/include/modulelist @@ -12,14 +12,8 @@ N kvm-intel.ko N kvm-amd.ko N kvm.ko -# acpi / cpufreq +# acpi N acpi_call.ko -N acpi-cpufreq.ko -N cpufreq_conservative.ko -N cpufreq_ondemand.ko -N cpufreq_powersave.ko -N cpufreq_performance.ko -N cpufreq_userspace.ko # misc N check_signature.ko diff --git a/files/initrd/opt/arc/init.sh b/files/initrd/opt/arc/init.sh index 2097eb4c..dd23cb26 100755 --- a/files/initrd/opt/arc/init.sh +++ b/files/initrd/opt/arc/init.sh @@ -51,7 +51,7 @@ initConfigKey "bootipwait" "30" "${USER_CONFIG_FILE}" initConfigKey "directboot" "false" "${USER_CONFIG_FILE}" initConfigKey "dsmlogo" "true" "${USER_CONFIG_FILE}" initConfigKey "emmcboot" "false" "${USER_CONFIG_FILE}" -initConfigKey "governor" "performance" "${USER_CONFIG_FILE}" +initConfigKey "governor" "" "${USER_CONFIG_FILE}" initConfigKey "hddsort" "false" "${USER_CONFIG_FILE}" initConfigKey "kernel" "official" "${USER_CONFIG_FILE}" initConfigKey "kernelload" "power" "${USER_CONFIG_FILE}" diff --git a/files/initrd/opt/arc/ramdisk-patch.sh b/files/initrd/opt/arc/ramdisk-patch.sh index d95cede0..7bcc785d 100755 --- a/files/initrd/opt/arc/ramdisk-patch.sh +++ b/files/initrd/opt/arc/ramdisk-patch.sh @@ -172,7 +172,7 @@ echo "export KEYMAP=\"${KEYMAP}\"" >>"${RAMDISK_PATH}/addons/addons.sh" chmod +x "${RAMDISK_PATH}/addons/addons.sh" # System Addons -for ADDON in "redpill" "revert" "misc" "eudev" "disks" "localrss" "notify" "updatenotify" "wol" "mountloader" "powersched" "cpufreqscaling"; do +for ADDON in "redpill" "revert" "misc" "eudev" "disks" "localrss" "notify" "updatenotify" "wol" "mountloader"; do PARAMS="" if [ "${ADDON}" == "disks" ]; then PARAMS=${HDDSORT}