Merge "Make apt-get upgrade non-interactive for configuration"

[releng/builder.git] / vagrant / gbp-ubuntu-docker-ovs-node / bootstrap.sh

diff --git a/vagrant/gbp-ubuntu-docker-ovs-node/bootstrap.sh b/vagrant/gbp-ubuntu-docker-ovs-node/bootstrap.sh
index 2fadf142d43d3f5b82bffa1c232b542cad2f4541..e8ac368235ae07070f9569d4a1c9fb9887e90e39 100644 (file)
--- a/vagrant/gbp-ubuntu-docker-ovs-node/bootstrap.sh
+++ b/vagrant/gbp-ubuntu-docker-ovs-node/bootstrap.sh
@@ -4,7 +4,8 @@
 
 echo "---> Updating operating system"
 apt-get update -qq
-apt-get upgrade -y --force-yes -qq
+DEBIAN_FRONTEND=noninteractive apt-get upgrade -y --force-yes -qq \
+    -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold"
 
 # we need garethr-docker in our puppet manifest to install docker
 # cleanly