Merge branch 'master' into safesemaphore

Conflicts:
	debian/changelog

1 files changed, 6 insertions, 5 deletions

diff --git a/Utility/INotify.hs b/Utility/INotify.hs
index 7934c2446..b55fbc953 100644
--- a/Utility/INotify.hs
+++ b/Utility/INotify.hs
@@ -164,10 +164,11 @@ tooManyWatches hook dir = do
 			]
 
 querySysctl :: Read a => [CommandParam] -> IO (Maybe a)
-querySysctl ps = do
-	v <- catchMaybeIO $ readProcess "sysctl" (toCommand ps)
-	case v of
-		Nothing -> return Nothing
-		Just s -> return $ parsesysctl s
+querySysctl ps = getM go ["sysctl", "/sbin/sysctl", "/usr/sbin/sysctl"]
 	where
+		go p = do
+			v <- catchMaybeIO $ readProcess p (toCommand ps)
+			case v of
+				Nothing -> return Nothing
+				Just s -> return $ parsesysctl s
 		parsesysctl s = readish =<< lastMaybe (words s)