From 3f761ada8cd0a90a0e0b9dfd20342a63ed7f48b8 Mon Sep 17 00:00:00 2001 From: Adam Israel Date: Wed, 7 Mar 2018 12:55:34 -0500 Subject: [PATCH] Fix upgrades in cached lxd image creation A recent update to vmware-tools in trusty caused dpkg to prompt the user to keep their existing configuration or use the new version, which caused the update-lxd-image script to fail. This instructs dpkg to choose which configuration file to keep, defaulting to the existing configuration. Signed-off-by: Adam Israel --- jenkins/VCA/update-lxd-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/VCA/update-lxd-image.sh b/jenkins/VCA/update-lxd-image.sh index 9cc15365..81b210c8 100755 --- a/jenkins/VCA/update-lxd-image.sh +++ b/jenkins/VCA/update-lxd-image.sh @@ -39,7 +39,7 @@ function cache() { lxc exec $container -- bash -c "while [ ! -f /var/lib/cloud/instance/boot-finished ]; do sleep 1; done" lxc exec $container -- apt-get update -y - lxc exec $container -- apt-get upgrade -y + lxc exec $container -- apt-get upgrade -y -o Dpkg::Options::='--force-confold' lxc exec $container -- apt-get install -y $PACKAGES $2 lxc exec $container -- pip3 install --upgrade pip lxc exec $container -- pip3 install --upgrade $PYPI -- 2.25.1