Merge branch 'master' into tf_refresh

This commit is contained in:
Chris Long
2019-05-09 21:01:11 -07:00
committed by GitHub
2 changed files with 2 additions and 2 deletions

View File

@@ -85,7 +85,7 @@ $ packer build --only=[vmware|virtualbox]-iso windows_2016.json
`mv *.box ../Boxes`
4. `cd` into the Vagrant directory: `cd ../Vagrant` and edit the `Vagrantfile`. Change the lines `cfg.vm.box = "detectionlab/win2016"` and `cfg.vm.box = "detectionlab/win10` to `cfg.cm.box = "../Boxes/windows_2016_<provider>.box"` and "`cfg.cm.box = "../Boxes/windows_10_<provider>.box"` respectively.
4. `cd` into the Vagrant directory: `cd ../Vagrant` and edit the `Vagrantfile`. Change the lines `cfg.vm.box = "detectionlab/win2016"` and `cfg.vm.box = "detectionlab/win10` to `cfg.vm.box = "../Boxes/windows_2016_<provider>.box"` and "`cfg.vm.box = "../Boxes/windows_10_<provider>.box"` respectively.
5. Install the Vagrant-Reload plugin: `vagrant plugin install vagrant-reload`

View File

@@ -246,7 +246,7 @@ function packer_build_box {
Set-Location "$DL_DIR\Packer"
Write-Output "Using Packer to build the $BOX Box. This can take 90-180 minutes depending on bandwidth and hardware."
$env:PACKER_LOG=1
$env:PACKER_LOG_PATH="$DL_DIR\Packer"
$env:PACKER_LOG_PATH="$DL_DIR\Packer\packer.log"
&$PackerPath @('build', "--only=$PackerProvider-iso", "$box.json")
Write-Host "[packer_build_box] Finished for $Box. Got exit code: $LASTEXITCODE"