From 8aea373a3abbd4c2235692c8d4b5950082997ec6 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mprokop@sipwise.com>
Date: Mon, 16 Jun 2014 17:51:56 +0200
Subject: [PATCH] MT#6253 Sync deployment.sh with status from netscript.git
 (12b283759)

---
 templates-ce/scripts/includes/deployment.sh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/templates-ce/scripts/includes/deployment.sh b/templates-ce/scripts/includes/deployment.sh
index 2b8bc03..5f7860b 100755
--- a/templates-ce/scripts/includes/deployment.sh
+++ b/templates-ce/scripts/includes/deployment.sh
@@ -43,6 +43,7 @@ LOGO=true
 BONDING=false
 VLAN=false
 VLANID=''
+VLANIF=''
 RETRIEVE_MGMT_CONFIG=false
 LINUX_HA3=false
 TRUNK_VERSION=false
@@ -225,9 +226,13 @@ if checkBootParam ngcpbonding ; then
   BONDING=true
 fi
 
-if checkBootParam ngcpvlan ; then
-  VLAN=true
-  VLANID=$(getBootParam ngcpvlan)
+if checkBootParam vlan ; then
+  VLANPARAMS=($(getBootParam vlan | tr ":" "\n"))
+  if [ ${#VLANPARAMS[@]} -eq 2 ] ; then
+    VLAN=true
+    VLANID=${VLANPARAMS[0]}
+    VLANIF=${VLANPARAMS[1]}
+  fi
 fi
 
 if checkBootParam ngcpmgmt ; then
@@ -1423,8 +1428,9 @@ EOF
     mysql \
     nfs-kernel-server \
     ngcp-mediaproxy-ng-daemon \
-    ngcp-rtpengine-daemon \
     ngcp-rate-o-mat \
+    ngcp-rtpengine-daemon \
+    ngcp-sems \
     ntp \
     rsyslog \
     sems ; \
@@ -1624,7 +1630,7 @@ iface vlan${VLANID} inet static
         netmask $(ifdata -pn $EXTERNAL_DEV)
         gateway $(route -n | awk '/^0\.0\.0\.0/{print $2; exit}')
         dns-nameservers $(awk '/^nameserver/ {print $2}' /etc/resolv.conf | xargs echo -n)
-        vlan-raw-device $EXTERNAL_DEV
+        vlan-raw-device $VLANIF
 
 auto $INTERNAL_DEV
 iface $INTERNAL_DEV inet static