From e6fbeb4f03e18bbc6d4a62b0195e0c79021c41a6 Mon Sep 17 00:00:00 2001 From: Lukas Larsson Date: Wed, 6 Aug 2014 15:06:02 +0200 Subject: os_mon: Ignore posix_only on windows and solaris --- lib/os_mon/doc/src/disksup.xml | 3 ++- lib/os_mon/src/disksup.erl | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'lib/os_mon') diff --git a/lib/os_mon/doc/src/disksup.xml b/lib/os_mon/doc/src/disksup.xml index c8566d0126..0e76178edb 100644 --- a/lib/os_mon/doc/src/disksup.xml +++ b/lib/os_mon/doc/src/disksup.xml @@ -81,7 +81,8 @@ necessary on embedded systems with stripped-down versions of Unix tools like df. The returned disk data and alarms can be different when using this option.

-

The parameter is ignored on Windows.

+

The parameter is ignored on platforms that are known to not be + posix compatible (Windows and SunOS).

See config(4) for diff --git a/lib/os_mon/src/disksup.erl b/lib/os_mon/src/disksup.erl index 3fd80f2365..af5bcc6fe8 100644 --- a/lib/os_mon/src/disksup.erl +++ b/lib/os_mon/src/disksup.erl @@ -211,14 +211,14 @@ format_status(_Opt, [_PDict, #state{os = OS, threshold = Threshold, get_os(PosixOnly) -> case os:type() of - {unix, _} when PosixOnly -> - {unix, posix}; {unix, sunos} -> - case os:version() of + case os:version() of {5,_,_} -> {unix, solaris}; {4,_,_} -> {unix, sunos4}; V -> exit({unknown_os_version, V}) - end; + end; + {unix, _} when PosixOnly -> + {unix, posix}; {unix, irix64} -> {unix, irix}; OS -> OS -- cgit v1.2.3