From edf3a5d3084c14e4ade1723baaf48065ffaf5974 Mon Sep 17 00:00:00 2001
From: Brielle Bruns <bruns@2mbit.com>
Date: Sun, 13 May 2018 21:29:40 -0600
Subject: [PATCH] no message

---
 config                         |  3 ++-
 network/network-config-dhcp-v1 |  1 +
 network/network-config-v1      | 14 +++++++-------
 virt-install-cloud.sh          |  2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/config b/config
index 0e50995..c95ecba 100644
--- a/config
+++ b/config
@@ -24,4 +24,5 @@ FORMAT=raw
 CONVERT=yes
 
 # Addresses to use by default for name servers
-nameservers="8.8.8.8, 1.1.1.1"
\ No newline at end of file
+nameserver1="8.8.8.8"
+nameserver2="1.1.1.1"
\ No newline at end of file
diff --git a/network/network-config-dhcp-v1 b/network/network-config-dhcp-v1
index 6df1c09..63c37e2 100644
--- a/network/network-config-dhcp-v1
+++ b/network/network-config-dhcp-v1
@@ -6,3 +6,4 @@ config:
   name: eth0
   subnets:
   - type: dhcp
+    control: hotplug
diff --git a/network/network-config-v1 b/network/network-config-v1
index e39a7f7..d3ca931 100644
--- a/network/network-config-v1
+++ b/network/network-config-v1
@@ -6,12 +6,12 @@ config:
   name: eth0
   subnets:
   - type: static
+    control: auto
     address: %IP_ADDRESS%
     netmask: %NETMASK%
-    routes:
-    - network: 0.0.0.0
-      netmask: 0.0.0.0
-      gateway: %GATEWAY%
-- type: nameserver
-  address: [%NAME_SERVER%]
-  search: [%DOMAIN%]
\ No newline at end of file
+    gateway: %GATEWAY%
+    dns_nameservers:
+      -%NAMESERVER1%
+      -%NAMESERVER2%
+    dns_search:
+      -%DOMAIN%
\ No newline at end of file
diff --git a/virt-install-cloud.sh b/virt-install-cloud.sh
index 5a8b6a7..9c207a4 100755
--- a/virt-install-cloud.sh
+++ b/virt-install-cloud.sh
@@ -136,7 +136,7 @@ elif [[ $virt_netinfo_type == "1" ]]; then
 		extra_iso_files=" -map $WORKING_DIR/output/network-config network-config"
 	else
 		sed -e "s/%DOMAIN%/${domain}/" -e "s/%IP_ADDRESS%/${virt_netinfo_address}/" -e "s/%NETMASK%/${virt_netinfo_netmask}/" \
-			-e "s/%GATEWAY%/${virt_netinfo_gateway}/" -e "s/%NAME_SERVER%/${nameservers}/" \
+			-e "s/%GATEWAY%/${virt_netinfo_gateway}/" -e "s/%NAMESERVER1%/${nameserver1}/" -e "s/%NAMESERVER2%/${nameserver2}/" \
 			${WORKING_DIR}/network/network-config-v1 > ${WORKING_DIR}/output/network-config
 		extra_iso_files=" -map $WORKING_DIR/output/network-config network-config"
 	fi