From b45c120f7bf451b13e8f58eab151e9d327fb327c Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Tue, 23 Jul 2019 16:19:29 +0200
Subject: [PATCH] Name shell provisioners to avoid conflicts
Names and upload paths avoid that several provisioners end up
being /tmp/vagrant_shell
---
minicoin/Vagrantfile | 2 ++
minicoin/roles/script/provision.rb | 9 ++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/minicoin/Vagrantfile b/minicoin/Vagrantfile
index 09a847d..c5f8f25 100644
--- a/minicoin/Vagrantfile
+++ b/minicoin/Vagrantfile
@@ -456,6 +456,7 @@ def sshfs_share_folder(box, host_path, guest_path)
upload_path = "/tmp/vagrant-shell/#{guest_base}_mount"
mount_command = {
privileged: false,
+ name: "sshfs_mount",
upload_path: "#{upload_path}.sh",
inline: \
"if [[ ! -d #{mount_point} ]]; then " \
@@ -587,6 +588,7 @@ def win_link_folders(box)
SCRIPT
box.vm.provision "shell",
+ name: "win_link_folders",
inline: link_cmd
end
diff --git a/minicoin/roles/script/provision.rb b/minicoin/roles/script/provision.rb
index 5eff9ed..aaef280 100644
--- a/minicoin/roles/script/provision.rb
+++ b/minicoin/roles/script/provision.rb
@@ -3,5 +3,12 @@ def script_provision(vm, args)
if !script.is_a?(String)
throw "Argument error: expecting a 'script' string"
end
- vm.provision "shell", inline:args["script"]
+ upload_path = "/tmp/vagrant-shell/script_provisioning.sh"
+ if vm.guest == :windows
+ upload_path = "c:\\Windows\\temp\\script_provisioning.ps1"
+ end
+ vm.provision "shell",
+ name: "script_provisioning",
+ upload_path: upload_path,
+ inline:args["script"]
end
--
GitLab