support/misc/Vagrantfile: reorganize provisioning

* Remove distribution upgrade cause it slows down the first boot and
  presents a bug when executed non interactively.

* Reorganize provision scripts to be in privileged and non privileged
  sections

* Add Ubuntu mirror automatic handling for apt packages sources

Fixes bug #9581

Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile
index dc4c15d51e2d842f514c660206fc1f8fc2f4ed29..89973ceeb04a4faeca5e58163e7c5a1efc36c212 100644 (file)
--- a/support/misc/Vagrantfile
+++ b/support/misc/Vagrantfile
@@ -41,19 +41,20 @@ Vagrant.configure('2') do |config|
                end
        end
 
-       config.vm.provision 'shell', inline:
-               "sudo dpkg --add-architecture i386
-               sudo apt-get -q update
-               sudo apt-get purge -q -y snapd lxcfs lxd ubuntu-core-launcher snap-confine
-               sudo apt-get -q -y upgrade
-               sudo apt-get -q -y install build-essential libncurses5-dev \
+       config.vm.provision 'shell', privileged: true, inline:
+               "sed -i 's|deb http://us.archive.ubuntu.com/ubuntu/|deb mirror://mirrors.ubuntu.com/mirrors.txt|g' /etc/apt/sources.list
+               dpkg --add-architecture i386
+               apt-get -q update
+               apt-get purge -q -y snapd lxcfs lxd ubuntu-core-launcher snap-confine
+               apt-get -q -y install build-essential libncurses5-dev \
                        git bzr cvs mercurial subversion libc6:i386 unzip bc
-               sudo apt-get -q -y autoremove
-               sudo apt-get -q -y clean
-               sudo update-locale LC_ALL=C"
+               apt-get -q -y autoremove
+               apt-get -q -y clean
+               update-locale LC_ALL=C"
 
        config.vm.provision 'shell', privileged: false, inline:
                "echo 'Downloading and extracting buildroot #{RELEASE}'
                wget -q -c http://buildroot.org/downloads/buildroot-#{RELEASE}.tar.gz
                tar axf buildroot-#{RELEASE}.tar.gz"
+
 end