From 3e496952a01e529beb12949a7df2736cfa8f9ed5 Mon Sep 17 00:00:00 2001 From: Tomas Janousek Date: Sat, 3 May 2014 13:31:35 +0200 Subject: CoreTemp: Add alternative path for linux 3.15 Since v3.15-rc1, coretemp temperatures are elsewhere, see http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=d72d19c26c417d514787ae85b197af34de286c0a http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=bab2243ce1897865e31ea6d59b0478391f51812b --- src/Plugins/Monitors/CoreTemp.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Plugins/Monitors/CoreTemp.hs b/src/Plugins/Monitors/CoreTemp.hs index eebdc95..bfe9aca 100644 --- a/src/Plugins/Monitors/CoreTemp.hs +++ b/src/Plugins/Monitors/CoreTemp.hs @@ -38,7 +38,8 @@ runCoreTemp _ = do dn <- getConfigValue decDigits failureMessage <- getConfigValue naString let path = ["/sys/bus/platform/devices/coretemp.", "/temp", "_input"] + path' = ["/sys/bus/platform/devices/coretemp.", "/hwmon/hwmon", "/temp", "_input"] lbl = Just ("_label", read . (dropWhile (not . isDigit))) divisor = 1e3 :: Double show' = showDigits (max 0 dn) - checkedDataRetrieval failureMessage [path] lbl (/divisor) show' + checkedDataRetrieval failureMessage [path, path'] lbl (/divisor) show' -- cgit v1.2.3