From 3256514bc45ff20666cc3d82288fa8178e3d7d6b Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Tue, 18 Oct 2011 12:57:04 +0000 Subject: [PATCH] export TRUNK_VERSION and make sure it is used correct inside subshell From: Michael Prokop --- deployment.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/deployment.sh b/deployment.sh index fb4ab13..e700721 100755 --- a/deployment.sh +++ b/deployment.sh @@ -123,6 +123,7 @@ fi if checkBootParam ngcptrunk ; then TRUNK_VERSION=true fi +export TRUNK_VERSION # make sure it's available within grml-chroot subshell if checkBootParam nolocalmirror ; then USE_LOCAL_MIRROR=false @@ -849,7 +850,7 @@ if "$NGCP_INSTALLER" ; then PKG=$INSTALLER wget http://deb.sipwise.com/sppro/${INSTALLER_PATH}\$PKG dpkg -i \$PKG -TRUNK_VERSION=\$TRUNK_VERSION 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 @@ -863,7 +864,7 @@ EOT PKG=$INSTALLER wget http://deb.sipwise.com/sppro/${INSTALLER_PATH}\$PKG dpkg -i \$PKG -TRUNK_VERSION=\$TRUNK_VERSION 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 @@ -877,7 +878,7 @@ EOT PKG=$INSTALLER wget http://deb.sipwise.com/spce/${INSTALLER_PATH}\$PKG dpkg -i \$PKG -echo y | TRUNK_VERSION=\$TRUNK_VERSION 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