diff options
| author | Jean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr> | 2016-04-26 17:16:21 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr> | 2016-04-26 17:16:21 +0200 |
| commit | 9532743d5c9db954f42693e5f412fdfed0213e1d (patch) | |
| tree | 15c64cd90fae7fa1e7db089509d9ffac48b9f551 /src | |
| parent | ebac3c4cf22a6b0535236206eedf55b1d82c0eba (diff) | |
| parent | 473beb92b3bd3b22dd26b565af19a49e1151f3d9 (diff) | |
| download | rabbitmq-server-git-9532743d5c9db954f42693e5f412fdfed0213e1d.tar.gz | |
Merge branch 'stable'
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_disk_monitor.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/rabbit_disk_monitor.erl b/src/rabbit_disk_monitor.erl index 88a8096fd4..a56b92b501 100644 --- a/src/rabbit_disk_monitor.erl +++ b/src/rabbit_disk_monitor.erl @@ -213,9 +213,11 @@ get_disk_free(Dir) -> get_disk_free(Dir, {unix, Sun}) when Sun =:= sunos; Sun =:= sunos4; Sun =:= solaris -> - parse_free_unix(rabbit_misc:os_cmd("/usr/bin/df -k " ++ Dir)); + Df = os:find_executable("df"), + parse_free_unix(rabbit_misc:os_cmd(Df ++ " -k " ++ Dir)); get_disk_free(Dir, {unix, _}) -> - parse_free_unix(rabbit_misc:os_cmd("/bin/df -kP " ++ Dir)); + Df = os:find_executable("df"), + parse_free_unix(rabbit_misc:os_cmd(Df ++ " -kP " ++ Dir)); get_disk_free(Dir, {win32, _}) -> parse_free_win32(rabbit_misc:os_cmd("dir /-C /W \"" ++ Dir ++ "\"")). |