summaryrefslogtreecommitdiff
path: root/sql/wsrep_utils.cc
diff options
context:
space:
mode:
authorSeppo Jaakola <seppo.jaakola@codership.com>2012-11-28 17:38:32 +0200
committerSeppo Jaakola <seppo.jaakola@codership.com>2012-11-28 17:38:32 +0200
commitfc6cd855e9dd1b89a45f6584b3bd21ddc1f60607 (patch)
tree2a377ec91affec1a730a51231408af2a50a7bb51 /sql/wsrep_utils.cc
parent9b47a442b5452cb6c541e312f78746e7739e9f42 (diff)
downloadmariadb-git-fc6cd855e9dd1b89a45f6584b3bd21ddc1f60607.tar.gz
References: lp:1066784 - Merged revisions 3810-3827 from lp:codership-mysql
Diffstat (limited to 'sql/wsrep_utils.cc')
-rw-r--r--sql/wsrep_utils.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/wsrep_utils.cc b/sql/wsrep_utils.cc
index b1bd6de07cf..daba0e4cab2 100644
--- a/sql/wsrep_utils.cc
+++ b/sql/wsrep_utils.cc
@@ -354,8 +354,9 @@ size_t guess_ip (char* buf, size_t buf_len)
// try to find the address of the first one
#if (TARGET_OS_LINUX == 1)
const char cmd[] = "/sbin/ifconfig | "
- "grep -m1 -1 -E '^[a-z]?eth[0-9]' | tail -n 1 | "
- "awk '{ print $2 }' | awk -F : '{ print $2 }'";
+// "grep -m1 -1 -E '^[a-z]?eth[0-9]' | tail -n 1 | "
+ "grep -E '^[[:space:]]+inet addr:' | grep -m1 -v 'inet addr:127' | "
+ "sed 's/:/ /' | awk '{ print $3 }'";
#elif defined(__sun__)
const char cmd[] = "/sbin/ifconfig -a | "
"/usr/gnu/bin/grep -m1 -1 -E 'net[0-9]:' | tail -n 1 | awk '{ print $2 }'";