From d89980e1bd88cffec4d1352544170d41714d184d Mon Sep 17 00:00:00 2001 From: deajan Date: Fri, 18 Nov 2016 12:53:07 +0100 Subject: [PATCH] Fixed _CheckDiskSpaceRemote compat on CentOS 5 --- dev/n_osync.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/n_osync.sh b/dev/n_osync.sh index d02986d..6a2159e 100755 --- a/dev/n_osync.sh +++ b/dev/n_osync.sh @@ -285,7 +285,7 @@ function _CheckDiskSpaceLocal { Logger "Checking minimum disk space in [$replica_path]." "NOTICE" # Check for -P portability switch - if df -P; then + if df -P > /dev/null 2>&1; then diskSpace=$(df -P "$replica_path" | tail -1 | awk '{print $4}') else diskSpace=$(df "$replica_path" | tail -1 | awk '{print $4}') @@ -317,7 +317,7 @@ function _CheckDiskSpaceRemote { CheckConnectivity3rdPartyHosts CheckConnectivityRemoteHost - cmd=$SSH_CMD' "'$COMMAND_SUDO' df \"'$replica_path'\"" > "'$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID'" 2>&1' + cmd=$SSH_CMD' "'$COMMAND_SUDO' if df -P > /dev/null 2>&1; then df -P \"'$replica_path'\"; else df \"'$replica_path'\"; fi" > "'$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID'" 2>&1' Logger "cmd: $cmd" "DEBUG" eval "$cmd" if [ $? != 0 ]; then