summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorTomas Janousek <tomi@nomi.cz>2014-05-03 13:31:35 +0200
committerTomas Janousek <tomi@nomi.cz>2014-05-03 13:31:35 +0200
commit3e496952a01e529beb12949a7df2736cfa8f9ed5 (patch)
tree1667fff3bdc863da1ba47689f609d0c52baa1108
parent4218ab4b76e81227364ed008d8d55a8c5f3ed1a0 (diff)
downloadxmobar-3e496952a01e529beb12949a7df2736cfa8f9ed5.tar.gz
xmobar-3e496952a01e529beb12949a7df2736cfa8f9ed5.tar.bz2
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
-rw-r--r--src/Plugins/Monitors/CoreTemp.hs3
1 files changed, 2 insertions, 1 deletions
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'