From deaf0a2add2d526c5d2d21b6ad70a62d96709d95 Mon Sep 17 00:00:00 2001
From: Victor Seva <vseva@sipwise.com>
Date: Fri, 23 Jan 2015 17:06:46 +0100
Subject: [PATCH] MT#11063 Sync with bootenv: don't try to figure out the
 INTERNAL_NETMASK if it is already set by parameter

Change-Id: Iaab9bda6ca22e3870bc160ee8c208ac544166de2
---
 deployment.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/deployment.sh b/deployment.sh
index a3688e1..e6beebe 100755
--- a/deployment.sh
+++ b/deployment.sh
@@ -705,10 +705,10 @@ if "$PRO_EDITION" ; then
     IP1=$(awk '/sp1/ { print $1 }' /tmp/hosts) || IP1=$DEFAULT_IP1
     IP2=$(awk '/sp2/ { print $1 }' /tmp/hosts) || IP2=$DEFAULT_IP2
 
-    wget --timeout=30 -O "/tmp/interfaces" "${MANAGEMENT_IP}:3000/nwconfig/${TARGET_HOSTNAME}"
-    INTERNAL_NETMASK=$(grep "$INTERNAL_DEV inet" -A2 /tmp/interfaces | awk '/netmask/ { print $2 }') \
-      || INTERNAL_NETMASK=$DEFAULT_INTERNAL_NETMASK
-    logit "ha_int sp1: $IP1 sp2: $IP2 netmask: $INTERNAL_NETMASK"
+    if [ -z "$INTERNAL_NETMASK" ]; then
+      wget --timeout=30 -O "/tmp/interfaces" "${MANAGEMENT_IP}:3000/nwconfig/${TARGET_HOSTNAME}"
+      INTERNAL_NETMASK=$(grep "$INTERNAL_DEV inet" -A2 /tmp/interfaces | awk '/netmask/ { print $2 }')
+    fi
   fi
 
   [ -n "$IP1" ] || IP1=$DEFAULT_IP1