From 8602ba08fedeb172865b21569cf4a70908709d72 Mon Sep 17 00:00:00 2001 From: Joe Fitzgerald Date: Mon, 20 Jan 2014 12:42:27 -0700 Subject: [PATCH 1/2] Fixes #26 --- vagrantfile-windows_2008_r2.template | 3 ++- vagrantfile-windows_2012.template | 3 ++- vagrantfile-windows_2012_r2.template | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/vagrantfile-windows_2008_r2.template b/vagrantfile-windows_2008_r2.template index cb4e3bb2..19fda6e5 100644 --- a/vagrantfile-windows_2008_r2.template +++ b/vagrantfile-windows_2008_r2.template @@ -4,7 +4,6 @@ Vagrant.configure("2") do |config| config.vm.define "vagrant-windows-2008-r2" config.vm.box = "windows_2008_r2" - config.vm.base_mac = "{{ .BaseMacAddress }}" # You should be using the vagrant-windows Vagrant Plugin! # Admin user name and password @@ -36,6 +35,7 @@ Vagrant.configure("2") do |config| v.vmx["ethernet0.virtualDev"] = "vmxnet3" v.vmx["RemoteDisplay.vnc.enabled"] = "false" v.vmx["RemoteDisplay.vnc.port"] = "5900" + v.vmx["scsi0.virtualDev"] = "lsisas1068" end config.vm.provider :vmware_workstation do |v, override| @@ -44,5 +44,6 @@ Vagrant.configure("2") do |config| v.vmx["ethernet0.virtualDev"] = "vmxnet3" v.vmx["RemoteDisplay.vnc.enabled"] = "false" v.vmx["RemoteDisplay.vnc.port"] = "5900" + v.vmx["scsi0.virtualDev"] = "lsisas1068" end end \ No newline at end of file diff --git a/vagrantfile-windows_2012.template b/vagrantfile-windows_2012.template index 3545522b..8ff1f4d6 100644 --- a/vagrantfile-windows_2012.template +++ b/vagrantfile-windows_2012.template @@ -4,7 +4,6 @@ Vagrant.configure("2") do |config| config.vm.define "vagrant-windows-2012" config.vm.box = "windows_2012" - config.vm.base_mac = "{{ .BaseMacAddress }}" # You should be using the vagrant-windows Vagrant Plugin! # Admin user name and password @@ -36,6 +35,7 @@ Vagrant.configure("2") do |config| v.vmx["ethernet0.virtualDev"] = "vmxnet3" v.vmx["RemoteDisplay.vnc.enabled"] = "false" v.vmx["RemoteDisplay.vnc.port"] = "5900" + v.vmx["scsi0.virtualDev"] = "lsisas1068" end config.vm.provider :vmware_workstation do |v, override| @@ -44,5 +44,6 @@ Vagrant.configure("2") do |config| v.vmx["ethernet0.virtualDev"] = "vmxnet3" v.vmx["RemoteDisplay.vnc.enabled"] = "false" v.vmx["RemoteDisplay.vnc.port"] = "5900" + v.vmx["scsi0.virtualDev"] = "lsisas1068" end end diff --git a/vagrantfile-windows_2012_r2.template b/vagrantfile-windows_2012_r2.template index 11faffd3..372b76e5 100644 --- a/vagrantfile-windows_2012_r2.template +++ b/vagrantfile-windows_2012_r2.template @@ -4,7 +4,6 @@ Vagrant.configure("2") do |config| config.vm.define "vagrant-windows-2012-r2" config.vm.box = "windows_2012_r2" - config.vm.base_mac = "{{ .BaseMacAddress }}" # You should be using the vagrant-windows Vagrant Plugin! # Admin user name and password @@ -36,6 +35,7 @@ Vagrant.configure("2") do |config| v.vmx["ethernet0.virtualDev"] = "vmxnet3" v.vmx["RemoteDisplay.vnc.enabled"] = "false" v.vmx["RemoteDisplay.vnc.port"] = "5900" + v.vmx["scsi0.virtualDev"] = "lsisas1068" end config.vm.provider :vmware_workstation do |v, override| @@ -44,5 +44,6 @@ Vagrant.configure("2") do |config| v.vmx["ethernet0.virtualDev"] = "vmxnet3" v.vmx["RemoteDisplay.vnc.enabled"] = "false" v.vmx["RemoteDisplay.vnc.port"] = "5900" + v.vmx["scsi0.virtualDev"] = "lsisas1068" end end \ No newline at end of file From 3c9647464fbcb4e576296abac6f9d7a7345abb09 Mon Sep 17 00:00:00 2001 From: Joe Fitzgerald Date: Mon, 20 Jan 2014 12:44:57 -0700 Subject: [PATCH 2/2] Update CHANGELOG for v1.6 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4fc1cd98..c9c58dd6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## v1.6 (January 20, 2014 + +* Remove `config.vm.base_mac = "{{ .BaseMacAddress }}"` from vagrantfile templates, ensure SCSI controller is set in VMX (fixes #26) + ## v1.5 (January 9, 2014) * Fix issue with installation of VM guest tools [GH-23]