From f67dff869d770a507435dc72745cd7c58c225a1f Mon Sep 17 00:00:00 2001
From: Michael Prokop <mprokop@sipwise.com>
Date: Mon, 17 Oct 2011 12:48:03 +0000
Subject: [PATCH] support trunk installer builds through ngcptrunk bootoption

From: Michael Prokop <mprokop@sipwise.com>
---
 deployment.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/deployment.sh b/deployment.sh
index b843989..fb4ab13 100755
--- a/deployment.sh
+++ b/deployment.sh
@@ -38,6 +38,7 @@ LOGO=true
 BONDING=false
 USE_LOCAL_MIRROR=true
 LINUX_HA3=false
+TRUNK_VERSION=false
 export DISK=sda # will be configured as /dev/sda
 
 ### helper functions {{{
@@ -119,6 +120,10 @@ if checkBootParam ngcpbonding ; then
   BONDING=true
 fi
 
+if checkBootParam ngcptrunk ; then
+  TRUNK_VERSION=true
+fi
+
 if checkBootParam nolocalmirror ; then
   USE_LOCAL_MIRROR=false
 fi
@@ -844,7 +849,7 @@ if "$NGCP_INSTALLER" ; then
 PKG=$INSTALLER
 wget http://deb.sipwise.com/sppro/${INSTALLER_PATH}\$PKG
 dpkg -i \$PKG
-ngcp-installer \$ROLE \$IP1 \$IP2 \$EADDR \$EIFACE 2>&1 | tee -a /tmp/ngcp-installer-debug.log
+TRUNK_VERSION=\$TRUNK_VERSION ngcp-installer \$ROLE \$IP1 \$IP2 \$EADDR \$EIFACE 2>&1 | tee -a /tmp/ngcp-installer-debug.log
 RC=\${PIPESTATUS[0]}
 if [ \$RC -ne 0 ] ; then
   echo "Fatal error while running ngcp-installer:" >&2
@@ -858,7 +863,7 @@ EOT
 PKG=$INSTALLER
 wget http://deb.sipwise.com/sppro/${INSTALLER_PATH}\$PKG
 dpkg -i \$PKG
-ngcp-installer \$ROLE \$IP1 \$IP2 \$EADDR \$EIFACE \$MCASTADDR 2>&1 | tee -a /tmp/ngcp-installer-debug.log
+TRUNK_VERSION=\$TRUNK_VERSION ngcp-installer \$ROLE \$IP1 \$IP2 \$EADDR \$EIFACE \$MCASTADDR 2>&1 | tee -a /tmp/ngcp-installer-debug.log
 RC=\${PIPESTATUS[0]}
 if [ \$RC -ne 0 ] ; then
   echo "Fatal error while running ngcp-installer (HA v3):" >&2
@@ -872,7 +877,7 @@ EOT
 PKG=$INSTALLER
 wget http://deb.sipwise.com/spce/${INSTALLER_PATH}\$PKG
 dpkg -i \$PKG
-echo y | ngcp-installer 2>&1 | tee -a /tmp/ngcp-installer-debug.log
+echo y | TRUNK_VERSION=\$TRUNK_VERSION ngcp-installer 2>&1 | tee -a /tmp/ngcp-installer-debug.log
 RC=\${PIPESTATUS[1]}
 if [ \$RC -ne 0 ] ; then
   echo "Fatal error while running ngcp-installer:" >&2