Merge ~joalif/ubuntu/+source/systemd:lp1806012 into ~joalif/ubuntu/+source/systemd:ubuntu/eoan-devel

[Ioanna Alifieraki]

[Dan Streetman (ddstreet)]

looks good!

review: Approve

Unmerged commits

fc23499... by Ioanna Alifieraki on 2019-05-08

Ondemand - add option to configure governor from /etc/default/cpufrequtils

diff --git a/debian/extra/set-cpufreq b/debian/extra/set-cpufreq
index 4ffe126..59da0be 100755
--- a/debian/extra/set-cpufreq
+++ b/debian/extra/set-cpufreq
@@ -5,32 +5,40 @@ set -eu
 FIRSTCPU=`cut -f1 -d- /sys/devices/system/cpu/online`
 AVAILABLE="/sys/devices/system/cpu/cpu$FIRSTCPU/cpufreq/scaling_available_governors"
 DOWN_FACTOR="/sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor"
+CPUFREQUTILS="/etc/default/cpufrequtils"
+GOVERNOR=""
+GOVS="interactive ondemand powersave"
 
 [ -f $AVAILABLE ] || exit 0
 
-read governors < $AVAILABLE
-case $governors in
-        *interactive*)
-                GOVERNOR="interactive"
-                break
-                ;;
-        *ondemand*)
-                GOVERNOR="ondemand"
-                case $(uname -m) in
-                        ppc64*)
-                                SAMPLING=100
+if [ -f $CPUFREQUTILS ]; then
+        echo "/etc/default/cpufrequtils file is present, will follow its policy"
+        . $CPUFREQUTILS
+fi
+
+GOVS="$GOVERNOR $GOVS"
+GOVERNOR=""
+
+read available_govs < $AVAILABLE
+for g in $GOVS
+do
+        for a in $available_govs
+        do
+                if [ "$g" = "$a" ] ; then
+                        GOVERNOR=$g
+                        break 2
+                fi
+        done
+done
+
+if [ "$GOVERNOR" = "ondemand" ] ; then
+        case $(uname -m) in
+                ppc64*)
+                        SAMPLING=100
                         ;;
-                esac
-                break
-                ;;
-        *powersave*)
-                GOVERNOR="powersave"
-                break
-                ;;
-        *)
-                exit 0
-                ;;
-esac
+        esac
+fi
+
 
 [ -n "${GOVERNOR:-}" ] || exit 0