aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2019-06-24 11:16:57 +0200
committerLukas Larsson <[email protected]>2019-06-24 11:16:57 +0200
commit793f5a78d2adaaa7c20e890758a6616c63b47290 (patch)
treeff2a4ae785e077d462af68385d426fb0de4ab2cf /lib
parent68b18034925e05be4bc462c6597d75082703c671 (diff)
parent7eeb6a98623fce87d13d3080430bec0bc412c570 (diff)
downloadotp-793f5a78d2adaaa7c20e890758a6616c63b47290.tar.gz
otp-793f5a78d2adaaa7c20e890758a6616c63b47290.tar.bz2
otp-793f5a78d2adaaa7c20e890758a6616c63b47290.zip
Merge branch 'lukas/os_mon/disk_sup_ignore_sqashfs/OTP-15778' into maint
* lukas/os_mon/disk_sup_ignore_sqashfs/OTP-15778: os_mon: Make disk_sup ignore squashfs
Diffstat (limited to 'lib')
-rw-r--r--lib/os_mon/src/disksup.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/os_mon/src/disksup.erl b/lib/os_mon/src/disksup.erl
index 5118d807e1..4253067c90 100644
--- a/lib/os_mon/src/disksup.erl
+++ b/lib/os_mon/src/disksup.erl
@@ -264,7 +264,7 @@ check_disk_space({unix, irix}, Port, Threshold) ->
Result = my_cmd("/usr/sbin/df -lk",Port),
check_disks_irix(skip_to_eol(Result), Threshold);
check_disk_space({unix, linux}, Port, Threshold) ->
- Result = my_cmd("/bin/df -lk", Port),
+ Result = my_cmd("/bin/df -lk -x squashfs", Port),
check_disks_solaris(skip_to_eol(Result), Threshold);
check_disk_space({unix, posix}, Port, Threshold) ->
Result = my_cmd("df -k -P", Port),