Attachment 175071 Details for Bug 201904 – patch to fix vagrant issue

[patch] patch to fix vagrant issue

PR201904.diff (text/plain), 1.56 KB, created by Steve Wills on 2016-09-22 17:51:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Wills

Created: 2016-09-22 17:51:57 UTC

Size: 1.56 KB

patch

obsolete

>Index: release/Makefile.vagrant
>===================================================================
>--- release/Makefile.vagrant	(revision 305573)
>+++ release/Makefile.vagrant	(working copy)
>@@ -63,10 +63,10 @@
> 	@cp vagrant-${PROVIDER}.vmdk ${PROVIDER}/vagrant.vmdk
> . if ${PROVIDER} == "virtualbox"
> 	@(cd ${.OBJDIR}/${PROVIDER} && echo '{"provider":"${PROVIDER}"}' > metadata.json)
>-	@(cd ${.OBJDIR}/${PROVIDER} && tar -czf ../${VAGRANT_TARGET}.${PROVIDER}.box metadata.json box.ovf vagrant.vmdk)
>+	@(cd ${.OBJDIR}/${PROVIDER} && tar -czf ../${VAGRANT_TARGET}.${PROVIDER}.box metadata.json box.ovf Vagrantfile vagrant.vmdk)
> . elif ${PROVIDER} == "vmware"
> 	@(cd ${.OBJDIR}/${PROVIDER} && echo '{"provider":"${PROVIDER}_desktop"}' > metadata.json)
>-	@(cd ${.OBJDIR}/${PROVIDER} && tar -czf ../${VAGRANT_TARGET}.${PROVIDER}.box metadata.json vagrant.vmx vagrant.vmdk)
>+	@(cd ${.OBJDIR}/${PROVIDER} && tar -czf ../${VAGRANT_TARGET}.${PROVIDER}.box metadata.json vagrant.vmx Vagrantfile vagrant.vmdk)
> . endif
> 
> CLEANFILES+=	vagrant-do-upload-${PROVIDER}
>@@ -85,6 +85,7 @@
> 
> virtualbox/box.ovf: ${.CURDIR}/scripts/box.ovf
> 	cp ${.ALLSRC} virtualbox/
>+	cp ${.CURDIR}/scripts/Vagrantfile virtualbox/
> 
> vmware/vagrant.vmx:
> 	@(cd vmware && echo '.encoding = "UTF-8"' > vagrant.vmx)
>Index: release/scripts/Vagrantfile
>===================================================================
>--- release/scripts/Vagrantfile	(nonexistent)
>+++ release/scripts/Vagrantfile	(working copy)
>@@ -0,0 +1,4 @@
>+Vagrant::Config.run do |config|
>+  config.vm.base_mac = "080027D14C66"
>+  config.ssh.shell = "sh"
>+end

Actions: View | Diff

Attachments on bug 201904: 175071 | 175072