From 203d7a4638d9449487e53369331fc103c892c339 Mon Sep 17 00:00:00 2001 From: Chris Long Date: Sat, 18 Apr 2020 22:53:35 -0700 Subject: [PATCH 1/2] Fixing eth1 ip detection logic Interfaces can have multiple IP addresses, causing this step to fail in Virtualbox --- Vagrant/bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrant/bootstrap.sh b/Vagrant/bootstrap.sh index d634b00..bd98ccb 100644 --- a/Vagrant/bootstrap.sh +++ b/Vagrant/bootstrap.sh @@ -88,7 +88,7 @@ fix_eth1_static_ip() { }' >>/etc/dhcp/dhclient.conf netplan apply # Fix eth1 if the IP isn't set correctly - ETH1_IP=$(ip -4 addr show eth1 | grep -oP '(?<=inet\s)\d+(\.\d+){3}') + ETH1_IP=$(ip -4 addr show eth1 | grep -oP '(?<=inet\s)\d+(\.\d+){3}' | head -1) if [ "$ETH1_IP" != "192.168.38.105" ]; then echo "Incorrect IP Address settings detected. Attempting to fix." ifdown eth1 From 9f14610928efee1bb09f20550a92a47f6322eb2d Mon Sep 17 00:00:00 2001 From: Chris Long Date: Sat, 18 Apr 2020 23:23:36 -0700 Subject: [PATCH 2/2] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f0ed1f3..161626b 100644 --- a/README.md +++ b/README.md @@ -60,14 +60,14 @@ NOTE: This lab has not been hardened in any way and runs with default vagrant cr - Note: Virtualbox is free, the [VMWare Desktop Vagrant plugin](https://www.vagrantup.com/vmware/#buy-now) is $80 and is required to use Vagrant with VMware. There are currently three ways to build the lab: -* **Recommended**: Use the boxes hosted on [Vagrant Cloud](https://app.vagrantup.com/detectionlab). This method should take **~2 hours** total to download the boxes and provision the lab. -* Build the boxes yourself using Packer. This method will take ~4 hours to build the boxes and another ~90-120 minutes to provision them for a total of **5-6 hours**. +* **Recommended**: Use the boxes hosted on [Vagrant Cloud](https://app.vagrantup.com/detectionlab). This method should take **~1 hour 20 minutes** total to download the boxes and provision the lab. +* Build the boxes yourself using Packer. This method will take ~1-2 hours to build the boxes and another ~90-120 minutes to provision them for a total of **2.5 - 4 hours**. * [Provision the lab in AWS using Terraform](Terraform/README.md). The lab can be brought online in under **30 minutes**. If you choose to use the boxes hosted on Vagrant Cloud, you may skip steps 2 and 3. If you don't trust pre-built boxes, I recommend following steps 2 and 3 to build them on your machine. -2. `cd` to the Packer directory and build the Windows 10 and Windows Server 2016 boxes using the commands below. Each build will take about 1 hour. As far as I know, you can only build one box at a time. +2. `cd` to the Packer directory and build the Windows 10 and Windows Server 2016 boxes using the commands below. Each build will take about 45 minutes. ``` $ cd detectionlab/Packer