From e51e5e940c5c0b2cfd1a9bc07833a933a0460c4e Mon Sep 17 00:00:00 2001 From: Nirbhay Choubey Date: Mon, 8 Dec 2014 23:44:53 -0500 Subject: [PATCH] Merged patch for lp:1167368 from maria-5.5-galera. --- sql/wsrep_utils.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sql/wsrep_utils.cc b/sql/wsrep_utils.cc index 14239c88785..64b9fb35b48 100644 --- a/sql/wsrep_utils.cc +++ b/sql/wsrep_utils.cc @@ -407,10 +407,8 @@ size_t wsrep_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 | " - "grep -E '^[[:space:]]+inet addr:' | grep -m1 -v 'inet addr:127' | " - "sed 's/:/ /' | awk '{ print $3 }'"; + const char cmd[] = "ip addr show | grep -E '^[[:space:]]*inet' | grep -m1 global |" + " awk '{ print $2 }' | sed -e 's/\\/.*//'"; #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 }'";