From 5ae15f682b2ee2afc6c3ea31512f10b0973121d3 Mon Sep 17 00:00:00 2001 From: Chris Long Date: Mon, 29 Mar 2021 22:21:14 -0700 Subject: [PATCH] Small fixes --- .gitignore | 1 - Vagrant/scripts/install-exchange.ps1 | 2 +- ci/build_machine_bootstrap.sh | 4 ---- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 667b1ff..9ee2540 100755 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -Azure/Ansible/inventory.yml Vagrant/.vagrant/* Vagrant/vagrant*.log Packer/packer_cache/* diff --git a/Vagrant/scripts/install-exchange.ps1 b/Vagrant/scripts/install-exchange.ps1 index ba06ccd..a61678d 100644 --- a/Vagrant/scripts/install-exchange.ps1 +++ b/Vagrant/scripts/install-exchange.ps1 @@ -22,7 +22,7 @@ $cplusplusInstallerUrl = "https://download.microsoft.com/download/2/E/6/2E61CFA4 $cplusplusInstallerPath = "$env:TEMP/vcredist_x64.exe" $cplusplusLogPath = "$env:TEMP/cplusplus_install_log.txt" $maxSleepTime = 900 -$physicalMemory = get-ciminstance -class "cim_physicalmemory" | % { $_.Capacity } +$physicalMemory = get-ciminstance -class "cim_physicalmemory" | % { $_.Capacity } | Select-Object -Last 1 Write-Host "$('[{0:HH:mm}]' -f (Get-Date)) [+] Attempting to install Microsoft exchange." Write-Host "$('[{0:HH:mm}]' -f (Get-Date)) [+] Please note, you will have to reboot and re-run this script after the prerequisites have been installed." diff --git a/ci/build_machine_bootstrap.sh b/ci/build_machine_bootstrap.sh index ba57b06..2e856b9 100755 --- a/ci/build_machine_bootstrap.sh +++ b/ci/build_machine_bootstrap.sh @@ -98,10 +98,6 @@ sysctl -p /etc/sysctl.conf > /dev/null cd /opt/DetectionLab/Vagrant || exit 1 sed -i 's/vb.gui = true/vb.gui = false/g' Vagrantfile -# Temporary workaround for VB 6.1 until this is fixed in Vagrant -# https://github.com/clong/DetectionLab/issues/374 -sed -i 's/--clipboard/--clipboard-mode/g' /opt/DetectionLab/Vagrant/Vagrantfile - # If the boxes are present on external storage, we can modify the Vagrantfile to # point to the boxes on disk so we don't have to download them if [ $BOXES_PRESENT -eq 1 ]; then