From fe3c39e11b54a2d9ceeae9b5990ebd060e0918fe Mon Sep 17 00:00:00 2001
From: Alexander Lutay <alutay@sipwise.com>
Date: Mon, 29 Feb 2016 16:29:40 +0100
Subject: [PATCH] MT#17849 Remove PXE handling from deployment.sh,
 ngcp-installer cares about iPXE

Change-Id: Ic6618da4f3787ea0a652dc0887e60a6684fb797b
(cherry picked from commit e4100cdec2ef19b64e1729f7879476b7f45a3241)
(cherry picked from commit 5283130b76870a95f662c816cf7352ca4a64c60c)
---
 deployment.sh | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/deployment.sh b/deployment.sh
index 694092e..caa8b35 100755
--- a/deployment.sh
+++ b/deployment.sh
@@ -69,8 +69,6 @@ DEBIAN_REPO_HOST="debian.sipwise.com"
 SIPWISE_REPO_HOST="deb.sipwise.com"
 SIPWISE_REPO_TRANSPORT="https"
 DPL_MYSQL_REPLICATION=true
-GRML_PXE_IMAGES_PATH="/lib/live/mount/medium"
-PXE_IMAGES_PATH="/tmp/grml_pxe"
 FILL_APPROX_CACHE=false
 VLAN_BOOT_INT=2
 VLAN_SSH_EXT=300
@@ -1506,7 +1504,6 @@ gen_installer_config () {
   if "$CARRIER_EDITION" ; then
     cat > ${TARGET}/etc/ngcp-installer/config_deploy.inc << EOF
 CROLE="${CROLE}"
-PXE_IMAGES_PATH="${PXE_IMAGES_PATH}"
 MANAGEMENT_IP="${MANAGEMENT_IP}"
 FILL_APPROX_CACHE="${FILL_APPROX_CACHE}"
 VLAN_BOOT_INT="${VLAN_BOOT_INT}"
@@ -1566,12 +1563,6 @@ if "$NGCP_INSTALLER" ; then
   # generate debian/sipwise repos
   set_repos
 
-  if "$CARRIER_EDITION"; then
-    logit "Mounting GRML image for ngcpcfg-api in ngcp-installer..."
-    mkdir -p "${TARGET}/$PXE_IMAGES_PATH"
-    mount --read-only --bind "$GRML_PXE_IMAGES_PATH" "${TARGET}/$PXE_IMAGES_PATH"
-  fi
-
   set_deploy_status "ngcp-installer"
 
   # install ngcp-installer
@@ -2133,9 +2124,6 @@ fi
 
 # don't leave any mountpoints
 sync
-if "$CARRIER_EDITION"; then
-  umount ${TARGET}/$PXE_IMAGES_PATH  2>/dev/null || true
-fi
 umount ${TARGET}/proc       2>/dev/null || true
 umount ${TARGET}/sys        2>/dev/null || true
 umount ${TARGET}/dev/pts    2>/dev/null || true