From cb91bf593c8cee63ddf71be3c275413305c895c8 Mon Sep 17 00:00:00 2001 From: Tian Yuanhao <52117554+tianyuanhao@users.noreply.github.com> Date: Sun, 8 Sep 2019 05:27:56 +0800 Subject: [PATCH] Install vagrant-disksize automatically (#1545) Signed-off-by: Tian Yuanhao --- Vagrantfile | 6 +----- config-vagrant.conf | 8 +------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 3a3f7f9b2a..0b6b6a6d40 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -18,12 +18,8 @@ Vagrant.configure(2) do |config| config.vm.box = "ubuntu/bionic64" config.vm.box_version = ">= 20180719.0.0" - ####################################################################### - # THIS REQUIRES YOU TO INSTALL A PLUGIN. RUN THE COMMAND BELOW... - # - # $ vagrant plugin install vagrant-disksize - # # Default images are not big enough to build Armbian. + config.vagrant.plugins = "vagrant-disksize" config.disksize.size = "40GB" # provisioning: install dependencies, download the repository copy diff --git a/config-vagrant.conf b/config-vagrant.conf index bf0481941d..d1a949a6ad 100644 --- a/config-vagrant.conf +++ b/config-vagrant.conf @@ -6,14 +6,8 @@ # remove "vagrant" from the command line since "vagrant-guest" will be passed instead shift -# check and install vagrant-disksize -if ! grep -q '^vagrant-disksize' <(vagrant plugin list); then - display_alert "Trying to install vargant-disksize plugin" - vagrant plugin install vagrant-disksize -fi - display_alert "Building and running the Vagrant box" -vagrant up +VAGRANT_INSTALL_LOCAL_PLUGINS=1 vagrant up || vagrant up display_alert "SSH config for the Vagrant box" vagrant ssh-config