From 75a614d9e57cbafa893abd8667ba064a48f31692 Mon Sep 17 00:00:00 2001 From: Krzysztof Wilczynski Date: Tue, 1 Nov 2016 19:29:01 +0000 Subject: [PATCH 1/2] Re-factor the Vagrantfile. Signed-off-by: Krzysztof Wilczynski --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index fb4f5cb6f0c2..8376d1de0ea0 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -16,7 +16,7 @@ ARCH="$(uname -m | sed 's|i686|386|' | sed 's|x86_64|amd64|')" export DEBIAN_PRIORITY=critical export DEBIAN_FRONTEND=noninteractive export DEBCONF_NONINTERACTIVE_SEEN=true -APT_OPTS="--yes --force-yes --no-install-suggests --no-install-recommends" +APT_OPTS="--yes --force-yes --no-install-suggests --no-install-recommends -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\"" echo "Upgrading packages ..." apt-get update ${APT_OPTS} >/dev/null apt-get upgrade ${APT_OPTS} >/dev/null From d4a64a261929626c334401f7f2b306e5da7d6c1c Mon Sep 17 00:00:00 2001 From: Krzysztof Wilczynski Date: Thu, 3 Nov 2016 18:34:00 +0000 Subject: [PATCH 2/2] Change to `--force` and `--force-yes` to `--assume-yes`. Signed-off-by: Krzysztof Wilczynski --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 8376d1de0ea0..ab3dd3c5346e 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -16,7 +16,7 @@ ARCH="$(uname -m | sed 's|i686|386|' | sed 's|x86_64|amd64|')" export DEBIAN_PRIORITY=critical export DEBIAN_FRONTEND=noninteractive export DEBCONF_NONINTERACTIVE_SEEN=true -APT_OPTS="--yes --force-yes --no-install-suggests --no-install-recommends -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\"" +APT_OPTS="--assume-yes --no-install-suggests --no-install-recommends -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\"" echo "Upgrading packages ..." apt-get update ${APT_OPTS} >/dev/null apt-get upgrade ${APT_OPTS} >/dev/null