From 360825cce35dce71b7d87c93aaaeb6053188dd17 Mon Sep 17 00:00:00 2001
From: Alexander Lutay <alutay@sipwise.com>
Date: Mon, 22 Aug 2016 11:32:49 +0200
Subject: [PATCH] MT#22131 Do not call 'apt-get update' inside chroot on
 virtualbox installation stage

IT doesn't nothing on those stages, while produce warnings.
JFYI, all the packages 'libc6-dev gcc bzip2 less linux-headers make sudo'
have been installed already as some NGCP dependencies,
so 'apt-get -y install ...' can also be removed, while lets keep the, for now.

TODO: migrate virtualbox guest edition part to ngcp-installer
(in proper place when apt-get update still works before shutdown).
There must be nothing in deployment.sh after ngcp-installer, IMHO.

Change-Id: I7d4457450b1b688965a73e62007e6958445c9ab6
---
 deployment.sh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/deployment.sh b/deployment.sh
index 2e3a47b..70338af 100755
--- a/deployment.sh
+++ b/deployment.sh
@@ -1966,9 +1966,6 @@ EOF
 }
 
 vagrant_configuration() {
-  # make sure we use the most recent package versions, including apt-key setup
-  grml-chroot "${TARGET}" apt-get update
-
   # bzip2, linux-headers-amd64 and make are required for VirtualBox Guest Additions installer
   # less + sudo are required for Vagrant itself
   echo "Installing software for VirtualBox Guest Additions installer"
@@ -1977,8 +1974,7 @@ vagrant_configuration() {
     squeeze) local linux_headers_package="linux-headers-2.6-amd64" ;;
           *) local linux_headers_package="linux-headers-amd64"     ;;
   esac
-  chroot "$TARGET" apt-get -y install bzip2 less ${linux_headers_package} make sudo
-  if [ $? -ne 0 ] ; then
+  if ! chroot "$TARGET" apt-get -y install bzip2 less ${linux_headers_package} make sudo ; then
     die "Error: failed to install 'bzip2 less ${linux_headers_package} make sudo' packages."
   fi
 
@@ -2030,7 +2026,6 @@ vagrant_configuration() {
   install_vbox_package
 
   # required for fake_uname and VBoxLinuxAdditions.run
-  grml-chroot $TARGET apt-get update
   grml-chroot $TARGET apt-get -y install libc6-dev gcc
   fake_uname