HAWQ-499: Fix IPv6 on OSX > 10.11

- OSX IPv6 addresses are currently fetched with a command that
  doesn't exist on OSX for versions < 10.11.


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/ca2a7708
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/ca2a7708
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/ca2a7708

Branch: refs/heads/HAWQ-459
Commit: ca2a77088def9d22419cf0cf9db1fa01826e0cb0
Parents: c72d066
Author: Jacob Frank <[email protected]>
Authored: Tue Mar 8 16:41:31 2016 -0800
Committer: rlei <[email protected]>
Committed: Tue Mar 15 16:29:06 2016 +0800

----------------------------------------------------------------------
 tools/bin/lib/hawqinit.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/ca2a7708/tools/bin/lib/hawqinit.sh
----------------------------------------------------------------------
diff --git a/tools/bin/lib/hawqinit.sh b/tools/bin/lib/hawqinit.sh
index af5635a..dab0b34 100755
--- a/tools/bin/lib/hawqinit.sh
+++ b/tools/bin/lib/hawqinit.sh
@@ -190,7 +190,7 @@ LOAD_GP_TOOLKIT () {
 }
 
 get_master_ipv6_addresses() {
-    if [ "${distro_based_on}" = "Mac" ] && [ "${distro_version:0:5}" = "10.11" 
]; then
+    if [ "${distro_based_on}" = "Mac" ]; then
         MASTER_IPV6_LOCAL_ADDRESS_ALL=(`${IFCONFIG} | ${GREP} inet6 | ${AWK} 
'{print $2}' | cut -d'%' -f1`)
     else
         MASTER_IPV6_LOCAL_ADDRESS_ALL=(`ip -6 address show |${GREP} 
inet6|${AWK} '{print $2}' |cut -d'/' -f1`)

Reply via email to