Merge pull request #568 from man715/master

Fix for Issue #525

HyperV/README.md

@@ -30,8 +30,6 @@ During the build you will also have to select the virtual switch you want to use
 
 A really hacky workaround is, if you are using the smb_username and smb_password options, would be to press the option number corresponding with the virtual switch you want to use then enter four times after `vagrant up`. So, if you know you want the virtual switch 1 `vagrant up` 1 enter 1 enter 1 enter 1 enter 
  
-Yes, I know hacky but it works.  
-
 ## How this build works 
 
 The majority of this build works the same as the VirtualBox build. The most notable difference is on the Windows builds. There is a script that will create an internal virtual switch called "NATSwitch." Throughout the build process, a script will create a second network adapter and attach it to the NATSwitch on the VM being built. After the machine is built the original network adapter will be removed from the VM.  

HyperV/Vagrantfile

@@ -15,6 +15,7 @@ Vagrant.configure("2") do |config|
     cfg.vm.provision "reload"
     cfg.vm.provision :shell, path: "check-eth0-ip.sh"
     cfg.vm.provision :shell, path: "../Vagrant/logger_bootstrap.sh"
+	cfg.vm.provision :shell, path: "reset-static-ip.sh"
     cfg.vm.provision :shell, path: "fix-motd.sh"
 
 

HyperV/reset-static-ip.sh

@@ -0,0 +1,23 @@
+reset_static_ip() {
+  # The bootstrap script assumes that there are two adapters and attempts to set the ip address
+  # to the eth1 adapter. This corrects the 01-netcfg.yaml file
+
+  MAC=$(ip a | grep "link/ether" | cut -d ' ' -f 6)
+  cat > /etc/netplan/01-netcfg.yaml << EOL
+network:
+  ethernets:
+    eth0:
+      match:
+        macaddress: $MAC
+      dhcp4: no
+      addresses: [192.168.38.105/24]
+      gateway4: 192.168.38.1
+      nameservers:
+        addresses: [8.8.8.8,8.8.4.4]
+      set-name: eth1
+  version: 2
+  renderer: networkd
+EOL
+}
+
+reset_static_ip