From fdc459ec5bbd3422af537f392d552bbdb7fe6f35 Mon Sep 17 00:00:00 2001
From: Jonathan Gold <jonathan.gold@container-solutions.com>
Date: Thu, 7 Nov 2019 06:51:56 -0500
Subject: [PATCH] vagrant: Update Vagrantfile

This patch updates the Vagrantfile to Fedora 31, and updates the
install process to match the quick start guide.
---
 Vagrantfile  | 11 ++++++-----
 vagrant/motd |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index c68c94d7..3fe5a2f0 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -6,7 +6,7 @@ Vagrant.configure(2) do |config|
 	config.vm.synced_folder ".", "/vagrant", disabled: true
 
 	config.vm.define "mgmt-dev" do |instance|
-		instance.vm.box = "fedora/28-cloud-base"
+		instance.vm.box = "bento/fedora-31"
 	end
 
 	config.vm.provider "virtualbox" do |v|
@@ -23,8 +23,7 @@ Vagrant.configure(2) do |config|
 	config.vm.provision "file", source: "vagrant/mgmt.bashrc", destination: ".mgmt.bashrc"
 	config.vm.provision "file", source: "~/.gitconfig", destination: ".gitconfig"
 
-	# copied from make-deps.sh (with added git)
-	config.vm.provision "shell", inline: "dnf install -y libvirt-devel golang golang-googlecode-tools-stringer hg git make gem"
+	config.vm.provision "shell", inline: "dnf install -y golang git make"
 
 	# set up packagekit
 	config.vm.provision "shell" do |shell|
@@ -39,8 +38,10 @@ Vagrant.configure(2) do |config|
 	script = <<-SCRIPT
 		grep -q 'mgmt\.bashrc' ~/.bashrc || echo '. ~/.mgmt.bashrc' >>~/.bashrc
 		. ~/.mgmt.bashrc
-		go get -u github.com/purpleidea/mgmt
-		cd ~/gopath/src/github.com/purpleidea/mgmt
+		mkdir -p ~/gopath/src/github.com/purpleidea
+		cd ~/gopath/src/github.com/purpleidea
+		git clone https://github.com/purpleidea/mgmt --recursive
+		cd mgmt
 		make deps
 	SCRIPT
 	config.vm.provision "shell" do |shell|
diff --git a/vagrant/motd b/vagrant/motd
index 2563dfed..cc4d182f 100644
--- a/vagrant/motd
+++ b/vagrant/motd
@@ -9,6 +9,6 @@ To get started, try:
 
 $ cdmgmt
 $ make clean build
-$ ./mgmt run --tmp-prefix lang examples/lang/hello0.mcl`
+$ ./mgmt run --tmp-prefix lang examples/lang/hello0.mcl
 
 Enjoy!