From 6d47ca2611c6f295e11d5d65098b3b2e4efadbc5 Mon Sep 17 00:00:00 2001
From: Alexander Lutay <alutay@sipwise.com>
Date: Mon, 14 Aug 2017 15:08:42 +0200
Subject: [PATCH] TT#20300 Discontinue GRML boot option 'ngcptrunk' (use common
 'ngcpvers=trunk')

Change-Id: I728cc4ca858ac75a434e36aba78abbbb46619479
---
 deployment.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/deployment.sh b/deployment.sh
index b7489d2..86e644b 100644
--- a/deployment.sh
+++ b/deployment.sh
@@ -409,11 +409,6 @@ if checkBootParam ngcpmgmt ; then
   RETRIEVE_MGMT_CONFIG=true
 fi
 
-if checkBootParam ngcptrunk ; then
-  TRUNK_VERSION=true
-fi
-export TRUNK_VERSION # make sure it's available within grml-chroot subshell
-
 ## detect environment {{{
 CHASSIS="No physical chassis found"
 if dmidecode| grep -q 'Rack Mount Chassis' ; then
@@ -481,6 +476,10 @@ fi
 # existing ngcp releases (like 2.2) with according repository and installer
 if checkBootParam ngcpvers ; then
   SP_VERSION=$(getBootParam ngcpvers)
+  if [ "${SP_VERSION:-}" = "trunk" ] ; then
+    TRUNK_VERSION=true
+  fi
+  export TRUNK_VERSION # make sure it's available within grml-chroot subshell
 fi
 
 if checkBootParam nongcp ; then