diff options
author | Henrik Nord <[email protected]> | 2011-04-08 17:36:25 +0200 |
---|---|---|
committer | Henrik Nord <[email protected]> | 2011-04-08 17:36:42 +0200 |
commit | d80b35fae2b7aca58f8b9c00304591e5f8dfdcb9 (patch) | |
tree | 4f145e3ec85dd8ef5bde70fde7b8dd189e465cfb | |
parent | e9f9c30b9c0ab94a615cc1dfa56cb36c03c804ea (diff) | |
parent | ca1223e5b5c8b25e92fef0d97a6a12abad8ccd71 (diff) | |
download | otp-d80b35fae2b7aca58f8b9c00304591e5f8dfdcb9.tar.gz otp-d80b35fae2b7aca58f8b9c00304591e5f8dfdcb9.tar.bz2 otp-d80b35fae2b7aca58f8b9c00304591e5f8dfdcb9.zip |
Merge branch 'at/os_mon_netbsd_support' into dev
* at/os_mon_netbsd_support:
Add NetBSD support to memsup and disksup
OTP-9216
-rw-r--r-- | lib/os_mon/src/disksup.erl | 4 | ||||
-rw-r--r-- | lib/os_mon/src/memsup.erl | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/os_mon/src/disksup.erl b/lib/os_mon/src/disksup.erl index 3340f7ee72..3ee1df759f 100644 --- a/lib/os_mon/src/disksup.erl +++ b/lib/os_mon/src/disksup.erl @@ -103,6 +103,7 @@ init([]) -> Flavor==darwin; Flavor==linux; Flavor==openbsd; + Flavor==netbsd; Flavor==irix64; Flavor==irix -> start_portprogram(); @@ -267,6 +268,9 @@ check_disk_space({unix, freebsd}, Port, Threshold) -> check_disk_space({unix, openbsd}, Port, Threshold) -> Result = my_cmd("/bin/df -k -t ffs", Port), check_disks_solaris(skip_to_eol(Result), Threshold); +check_disk_space({unix, netbsd}, Port, Threshold) -> + Result = my_cmd("/bin/df -k -t ffs", Port), + check_disks_solaris(skip_to_eol(Result), Threshold); check_disk_space({unix, sunos4}, Port, Threshold) -> Result = my_cmd("df", Port), check_disks_solaris(skip_to_eol(Result), Threshold); diff --git a/lib/os_mon/src/memsup.erl b/lib/os_mon/src/memsup.erl index 822e1f939c..8ed5e2d595 100644 --- a/lib/os_mon/src/memsup.erl +++ b/lib/os_mon/src/memsup.erl @@ -179,6 +179,7 @@ init([]) -> % Linux supports this. {unix, linux} -> true; {unix, openbsd} -> true; + {unix, netbsd} -> true; {unix, irix64} -> true; {unix, irix} -> true; {unix, sunos} -> true; @@ -612,6 +613,7 @@ code_change(Vsn, PrevState, "1.8") -> {unix, freebsd} -> false; {unix, linux} -> false; {unix, openbsd} -> true; + {unix, netbsd} -> true; {unix, sunos} -> true; {win32, _OSname} -> false; vxworks -> true |