From cdd9778b2a2da259664ea8b5af030fd40308a25f Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Wed, 25 Aug 2021 13:50:48 +0200 Subject: [PATCH] contrib/thermald: Use a coherent structure --- contrib/thermald/README.md | 5 ++++- .../thermal-conf.xml} | 8 ++++---- .../{SurfacePro5 => surface_pro_5}/40-surface-power.rules | 0 contrib/thermald/{SurfacePro5 => surface_pro_5}/README.md | 0 .../thermal-conf.xml.auto.cool | 0 .../thermal-conf.xml.auto.mobile | 0 .../thermal-conf.xml.auto.performance | 0 .../thermal-cpu-cdev-order.xml | 1 - .../{SurfacePro5 => surface_pro_5}/thermald.service | 0 9 files changed, 8 insertions(+), 6 deletions(-) rename contrib/thermald/{example_config_SL1.xml => surface_laptop_1/thermal-conf.xml} (92%) rename contrib/thermald/{SurfacePro5 => surface_pro_5}/40-surface-power.rules (100%) rename contrib/thermald/{SurfacePro5 => surface_pro_5}/README.md (100%) rename contrib/thermald/{SurfacePro5 => surface_pro_5}/thermal-conf.xml.auto.cool (100%) rename contrib/thermald/{SurfacePro5 => surface_pro_5}/thermal-conf.xml.auto.mobile (100%) rename contrib/thermald/{SurfacePro5 => surface_pro_5}/thermal-conf.xml.auto.performance (100%) rename contrib/thermald/{SurfacePro5 => surface_pro_5}/thermal-cpu-cdev-order.xml (99%) rename contrib/thermald/{SurfacePro5 => surface_pro_5}/thermald.service (100%) diff --git a/contrib/thermald/README.md b/contrib/thermald/README.md index 8a3349313..f3e2b9cc5 100644 --- a/contrib/thermald/README.md +++ b/contrib/thermald/README.md @@ -5,9 +5,12 @@ Modify the `65000` value to adapt that to your liking Tested on a Surface Book 2, other devices may need adapting, see e.g. the [thermald man page](http://manpages.ubuntu.com/manpages/trusty/man5/thermal-conf.xml.5.html). +More complex and device specific examples can be found in subdirectories +If any subdirectory does not have both files or any dedicated instructions, use the missing files provided here and/or follow these instructions. + ## Installation -Both XML files need to be placed in the `/etc/thermald/` directory. +Both XML files (`thermal-conf.xml` and `thermal-cpu-cdev-order-xml`) need to be placed in the `/etc/thermald/` directory. Newer thermald versions attempt to automatically load the configuration from ACPI. If you want to use a manual configuration with such a version, you may need to remove the `--adaptive` option from the systemd service `ExecStart` line. diff --git a/contrib/thermald/example_config_SL1.xml b/contrib/thermald/surface_laptop_1/thermal-conf.xml similarity index 92% rename from contrib/thermald/example_config_SL1.xml rename to contrib/thermald/surface_laptop_1/thermal-conf.xml index be53478d6..40004f5ba 100644 --- a/contrib/thermald/example_config_SL1.xml +++ b/contrib/thermald/surface_laptop_1/thermal-conf.xml @@ -1,9 +1,9 @@ - Override - * - QUIET + Override + * + QUIET test @@ -46,4 +46,4 @@ - + \ No newline at end of file diff --git a/contrib/thermald/SurfacePro5/40-surface-power.rules b/contrib/thermald/surface_pro_5/40-surface-power.rules similarity index 100% rename from contrib/thermald/SurfacePro5/40-surface-power.rules rename to contrib/thermald/surface_pro_5/40-surface-power.rules diff --git a/contrib/thermald/SurfacePro5/README.md b/contrib/thermald/surface_pro_5/README.md similarity index 100% rename from contrib/thermald/SurfacePro5/README.md rename to contrib/thermald/surface_pro_5/README.md diff --git a/contrib/thermald/SurfacePro5/thermal-conf.xml.auto.cool b/contrib/thermald/surface_pro_5/thermal-conf.xml.auto.cool similarity index 100% rename from contrib/thermald/SurfacePro5/thermal-conf.xml.auto.cool rename to contrib/thermald/surface_pro_5/thermal-conf.xml.auto.cool diff --git a/contrib/thermald/SurfacePro5/thermal-conf.xml.auto.mobile b/contrib/thermald/surface_pro_5/thermal-conf.xml.auto.mobile similarity index 100% rename from contrib/thermald/SurfacePro5/thermal-conf.xml.auto.mobile rename to contrib/thermald/surface_pro_5/thermal-conf.xml.auto.mobile diff --git a/contrib/thermald/SurfacePro5/thermal-conf.xml.auto.performance b/contrib/thermald/surface_pro_5/thermal-conf.xml.auto.performance similarity index 100% rename from contrib/thermald/SurfacePro5/thermal-conf.xml.auto.performance rename to contrib/thermald/surface_pro_5/thermal-conf.xml.auto.performance diff --git a/contrib/thermald/SurfacePro5/thermal-cpu-cdev-order.xml b/contrib/thermald/surface_pro_5/thermal-cpu-cdev-order.xml similarity index 99% rename from contrib/thermald/SurfacePro5/thermal-cpu-cdev-order.xml rename to contrib/thermald/surface_pro_5/thermal-cpu-cdev-order.xml index e690c5a26..75fe44a1e 100644 --- a/contrib/thermald/SurfacePro5/thermal-cpu-cdev-order.xml +++ b/contrib/thermald/surface_pro_5/thermal-cpu-cdev-order.xml @@ -15,4 +15,3 @@ The Following cooling device can present cpufreq Processor - diff --git a/contrib/thermald/SurfacePro5/thermald.service b/contrib/thermald/surface_pro_5/thermald.service similarity index 100% rename from contrib/thermald/SurfacePro5/thermald.service rename to contrib/thermald/surface_pro_5/thermald.service