switch back to using enabled check while ppd emulation is disabled by…

… default
hhd-dev · Jul 6, 2024 · 40a7da8 · 40a7da8
1 parent 7bdee33
commit 40a7da8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/adjustor/drivers/amd/__init__.py b/src/adjustor/drivers/amd/__init__.py
@@ -111,16 +111,17 @@ def settings(self):
             out = subprocess.check_output(
                 [
                     "systemctl",
-                    "list-unit-files",
+                    "list-units",
+                    "-t",
+                    "service",
+                    "--full",
+                    "--all",
                     "--plain",
                     "--no-legend",
                 ]
             )
             for line in out.decode().splitlines():
-                line = line.lower()
-                if (
-                    "power-profiles-daemon" in line or "tuned" in line
-                ) and "masked" not in line:
+                if "power-profiles-daemon" in line or "tuned" in line.lower():
                     self.ppd_conflict = True
                     break
         except Exception as e:

diff --git a/src/adjustor/drivers/amd/settings.yml b/src/adjustor/drivers/amd/settings.yml
@@ -98,7 +98,7 @@ conflict:
       type: display
       default: >-
         Energy Management can not be enabled while PPD or TuneD are enabled.
-        `systemctl mask power-profile-daemon` or `tuned`.
+        `systemctl disable --now power-profile-daemon` or `tuned`.
     enable:
       title: Enable Energy Management
       type: action