From 11818197ce008c39d5b638adea82275f83f07d1f Mon Sep 17 00:00:00 2001
From: Victor Seva <vseva@sipwise.com>
Date: Thu, 6 Nov 2014 15:13:30 +0100
Subject: [PATCH] MT#7999 fix commit 5b7f76f63cfdd. Install
 virtualbox-guest-additions-iso >=4.3.14-1~bpo70+1

Change-Id: I621f1e7680a3ddecf6e2601b5e7d847ff46c9051
---
 deployment.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/deployment.sh b/deployment.sh
index e0c9b89..1aa142a 100755
--- a/deployment.sh
+++ b/deployment.sh
@@ -216,16 +216,19 @@ install_vbox_package() {
 
   # use temporary apt database for speed reasons
   local TMPDIR=$(mktemp -d)
-  mkdir -p "${TMPDIR}/statedir/lists/partial" "${TMPDIR}/cachedir/archives/partial"
-  local debsrcfile=$(mktemp)
-  echo "deb http://deb.sipwise.com/debian/ wheezy-backports non-free" > "$debsrcfile"
+  mkdir -p "${TMPDIR}/etc/preferences.d" "${TMPDIR}/statedir/lists/partial" \
+    "${TMPDIR}/cachedir/archives/partial"
+  echo "deb http://debian.sipwise.com/debian/ wheezy-backports non-free" > \
+    "${TMPDIR}/etc/sources.list"
 
   DEBIAN_FRONTEND='noninteractive' apt-get -o dir::cache="${TMPDIR}/cachedir" \
-    -o dir::state="${TMPDIR}/statedir" -o dir::etc::sourcelist="$debsrcfile" \
-    -o Dir::Etc::sourceparts=/dev/null update
+    -o dir::state="${TMPDIR}/statedir" -o dir::etc="${TMPDIR}/etc" \
+    -o dir::etc::trustedparts="/etc/apt/trusted.gpg.d/" update
 
   DEBIAN_FRONTEND='noninteractive' apt-get -o dir::cache="${TMPDIR}/cachedir" \
-    -o dir::state="${TMPDIR}/statedir" -y --no-install-recommends install virtualbox-guest-additions-iso
+    -o dir::etc="${TMPDIR}/etc" -o dir::state="${TMPDIR}/statedir" \
+    -o dir::etc::trustedparts="/etc/apt/trusted.gpg.d/" \
+    -y --no-install-recommends install virtualbox-guest-additions-iso
 }
 
 ensure_augtool_present() {