Sync pp #3
Merged
Sync pp #3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix: Error starting VM: VBoxManage error: VBoxManage: error: Duplicate config values '/CPUM/CMPXCHG16B' and '/CPUM/IsaExts/CMPXCHG16B' - please remove the former! (VERR_DUPLICATE) /CPUM/CMPXCHG16B was deprecated at least in 2015 and removed in VirtualBox 6.
…e hyperv-iso builders so that it corresponds to the most recent Packer schema.
…nter, and eval-win81x86-enterprise templates.
…mplate_dir variable.
…emplates to use the template_dir variable.
…esponds to packer's schema.
Updated the schema for the hyperv-iso builders in all the templates.
Updated all the templates to use template_dir so that they can be built from anywhere
VirtualBox 6 compatibility fix
Allows for hardware version to be specified, addressing updated versions of VMware Workstation.
…uilder in the win7x64-enterprise-cygwin.json template.
…plate which somehow worked its way into the post-processors.
…on template which somehow worked its way into the post-processors.
… win7x64-pro-cygwin.json template as for some reason it's not part of the Packer 1.5.1's schema.
… win7x64-pro-ssh.json template as for some reason it's not part of the Packer 1.5.1's schema.
… win7x86-enterprise-cygwin.json template as for some reason it's not part of the Packer 1.5.1's schema.
… win7x86-enterprise-ssh.json, win7x86-pro-cygwin.json, win7x86-pro-ssh.json, win81x64-enterprise-cygwin.json, and the win81x64-enterprise-ssh.json templates.
…late as it should be using ssh.
…builder in the win7x64-enterprise-ssh, and the win81x64-pro-{ssh,cygwin} templates.
…he win2012r2-standard.json template as it seems to not be part of packer 1.5.1's schema.
…ser variable when defining the user variable for "memory".
…touches the Chef provisioners.
…cmtool.bat to explicitly specify a lowercase OMNITRUCK_MACHINE_ARCH.
…templates in order to allow passing of configuration management options to the provisioning scripts.
…the user about the Omnitruck API.
Updated the chef installers in script/cmtool.bat to constrain the installed components to the latest non-licensed (free) version by default, and to use "licensed" to represent the latest licensed (non-free) version. This PR is based on PR boxcutter#202.
… they begin with their Autounattend.xml script which makes the field hella easier to compare.
… so that they're hella easier to compare.
…albox builders in each of the templates.
…uilder for the eval-win7x86-enterprise-ssh.json template.
…t) to floppy_files for the hyperv-iso builder in the win2012r2-standard-cygwin.json template.
Clean up unused files (floppy/oracle-cert.cer) leftover from merging PR boxcutter#91 PR boxcutter#91 actually supersedes the usage of floppy/oracle-cert.cer when installing VirtualBox and so this code-signing certificate (which expired in 2019/03 anyways) is not in use anymore.
Fix the floppy_files for the hyperv-iso builder belonging to win2012r2-standard-cygwin.json template. This closes issue boxcutter#225.
Fix the floppy_files for the hyperv-iso builder belonging to the eval-win7x86-enterprise-ssh.json template. This closes issue boxcutter#224.
* disable-bits: (85 commits) disable bits disable bits disable bits update Makefile to allow disable bits spacing Fixed an instance of the wrong script being passed (floppy/openssh.bat) to floppy_files for the hyperv-iso builder in the win2012r2-standard-cygwin.json template. Added a missing floppy_files item for openssh.bat to the hyperv-iso builder for the eval-win7x86-enterprise-ssh.json template. Removed the floppy/oracle-cert.cer file as it's not used anymore. Removed unused reference to floppy/oracle-cert.cer from all the virtualbox builders in each of the templates. Sorted all of the floppy_files in all the templates lexicographically so that they're hella easier to compare. Updated the order of the floppy_files in all of the templates so that they begin with their Autounattend.xml script which makes the field hella easier to compare. Re-ordered some of the keys in all of the builders. Removed some stray double-quotes in script/cmtool.bat when informing the user about the Omnitruck API. Fixed the comments in script/cmtool.bat as you can't have them at the end of a conditional in batch files. Updated script/cmtool.bat to let the user know if an explicit version was chosen with the OMNITRUCK_VERSION environment variable. This case is not common and only exists to inform users that re-use this script in their own fork. Updated the documentation (README.md) to mention specifying "licensed" versus "latest" for the chef configuration management tools. Quick example of setting "latest" to the most recent free version of chef in script/cmtool.bat, and "licensed" to the most recent non-free version. Fixed the "update" user variable in wip/win2008r2-standardcore-cygwin.json so that it's a string. Re-ordered all the builders in the *-ssh.json and *-cygwin.json templates so that the ssh_username and ssh_password fields are defined near the end of the builder to help anchor (fuzzy) patches or search-replace next to the vm_name. Added the "ssh_timeout" to the hyperv-iso builder in the templates that were missing it. This option is used by packer's ssh communicator, but isn't documented in the hyperv-iso document. ...
(cherry picked from commit 6cda48c)
daxgames
added a commit
that referenced
this pull request
Feb 26, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.