[SCM] CTDB repository - branch master updated - ctdb-1.0.70b-25-gdfb16ce

[Ronnie Sahlberg]

The branch, master has been updated
       via  dfb16ce9ed65048d30109851737a9075d071ecdb (commit)
      from  a6cdf9106074890b76d2eabe496af244e0134d31 (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit dfb16ce9ed65048d30109851737a9075d071ecdb
Author: root <root at test1n1.VSOFS1.COM>
Date:   Thu Feb 5 14:44:46 2009 +1100

    use netstat to check first and only fall back to netcat if netstat is unavailable

-----------------------------------------------------------------------

Summary of changes:
 config/functions |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/functions b/config/functions
index ee48dd2..1073055 100644
--- a/config/functions
+++ b/config/functions
@@ -209,7 +209,11 @@ ctdb_check_tcp_ports() {
   # check availability of netcat or netstat first
   NETCAT=""
   NETSTAT=""
-  if [ -x /usr/bin/netcat ]; then
+  if [ -x /usr/bin/netstat ]; then
+      NETSTAT=/usr/bin/netstat
+  elif [ -x /bin/netstat ]; then
+      NETSTAT=/bin/netstat
+  elif [ -x /usr/bin/netcat ]; then
       NETCAT=/usr/bin/netcat
   elif [ -x /bin/netcat ]; then
       NETCAT=/bin/netcat
@@ -217,10 +221,6 @@ ctdb_check_tcp_ports() {
       NETCAT=/usr/bin/nc
   elif [ -x /bin/nc ]; then
       NETCAT=/bin/nc
-  elif [ -x /usr/bin/netstat ]; then
-      NETSTAT=/usr/bin/netstat
-  elif [ -x /bin/netstat ]; then
-      NETSTAT=/bin/netstat
   fi
 
   for p in $wait_ports; do


-- 
CTDB repository