From 8b74f65f384b67580dcf9c3b875ebb5f62c64411 Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Tue, 5 Mar 2019 22:17:19 -0500 Subject: [PATCH] vagrant: Rearrange steps of provision script - Disable automatic upgrades earlier in the script. This makes it more likely that unattended-upgrades will be disabled before it has a chance to run. - Move apt commands to the end. In the event that unattended-upgrades is running anyway, these command can fail and cause further steps to be skipped. Closes #1506 Signed-off-by: James Valleroy Reviewed-by: Sunil Mohan Adapa --- Vagrantfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index ab8314f7d..441d9cc89 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -24,22 +24,22 @@ Vagrant.configure(2) do |config| vb.memory = 2048 vb.linked_clone = true end + config.vm.provision "shell", run: 'always', inline: <<-SHELL + # Disable automatic upgrades + /vagrant/actions/upgrades disable-auto + # Do not run system plinth + systemctl stop plinth + systemctl disable plinth + SHELL config.vm.provision "shell", inline: <<-SHELL cd /vagrant/ ./setup.py install + systemctl daemon-reload apt-get update # In case new dependencies conflict with old dependencies apt-mark hold freedombox DEBIAN_FRONTEND=noninteractive apt-get install -y $(plinth --list-dependencies) apt-mark unhold freedombox - systemctl daemon-reload - SHELL - config.vm.provision "shell", run: 'always', inline: <<-SHELL - # Do not run system plinth - systemctl stop plinth - systemctl disable plinth - # Disable automatic upgrades - /vagrant/actions/upgrades disable-auto # Install ncurses-term DEBIAN_FRONTEND=noninteractive apt-get install -y ncurses-term SHELL