diff options
| author | Jean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr> | 2016-04-26 16:23:13 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr> | 2016-04-26 16:23:13 +0200 |
| commit | 9099f8b5579d8b8839384bec6c2897df16a6be7e (patch) | |
| tree | 1721dc2cfc2f5f70fc1fd2e8132f258a01f822b5 /src | |
| parent | 534cf5e6e64053c181c3f4b7bd33bb35567f1c55 (diff) | |
| parent | 4eaa46ef0ea1e1777c86a5ddc93e0cf447a3f448 (diff) | |
| download | rabbitmq-server-git-9099f8b5579d8b8839384bec6c2897df16a6be7e.tar.gz | |
Merge pull request #770 from rabbitmq/rabbitmq-server-dont-hardcode-df-path
Don't use hardcoded path to `df`
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 ++ "\"")). |