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

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

diff --git a/network/network-config-dhcp-v1 b/network/network-config-dhcp-v1
index 37ffaa4..874496b 100644
--- a/network/network-config-dhcp-v1
+++ b/network/network-config-dhcp-v1
@@ -7,4 +7,4 @@ config:
   subnets:
   - type: dhcp
 - type: nameserver
-  search: [%%DOMAIN%%]
\ No newline at end of file
+  search: [%DOMAIN%]
\ No newline at end of file
diff --git a/virt-install-cloud.sh b/virt-install-cloud.sh
index 0a9fd3e..1cca685 100755
--- a/virt-install-cloud.sh
+++ b/virt-install-cloud.sh
@@ -131,7 +131,9 @@ if [[ ${virt_netinfo_type} == "eni" ]]; then
 		echo "    gateway ${virt_netinfo_gateway}" >> ${WORKING_DIR}/output/meta-data
 	fi
 elif [[ $virt_netinfo_type == "1" ]]; then
-		echo "Not implemented yet!"
+	if [[ ${virt_netinfo_address} == "dhcp" ]]; then
+		sed -e "s/%DOMAIN%/${domain}/" ${WORKING_DIR}/network/network-config-dhcp-v1 > ${WORKING_DIR}/output/network-config
+		extra_iso_files=" -map $WORKING_DIR/output/network-config network-config"
 elif [[ $virt_netinfo_type == "2" ]]; then
 		echo "Not implemented yet!"
 fi
@@ -156,12 +158,16 @@ fi
 # write the two cloud-init files into an ISO
 echo "Preparing ISO file required by cloud-init..."
 #genisoimage -input-charset utf8 -output configuration.iso -volid cidata -joliet -rock user-data meta-data
-xorriso -in_charset utf8 -outdev configuration.iso -volid cidata -joliet on -rockridge on -map output/user-data user-data -map output/meta-data meta-data
+xorriso -in_charset utf8 -outdev configuration.iso -volid cidata -joliet on -rockridge on -map output/user-data user-data -map output/meta-data meta-data ${extra_iso_files}
 
 # keep a backup of the files for future reference
 if [[ "${BACKUP_ISO_FILES}" == "yes" ]]; then
   cp -f ${WORKING_DIR}/output/user-data ${WORKING_DIR}/backups/${hostname}.${domain}.user-data
   cp -f ${WORKING_DIR}/output/meta-data ${WORKING_DIR}/backups/${hostname}.${domain}.meta-data
+	if [[ -f ${WORKING_DIR}/output/network-config ]]; then
+		cp -f ${WORKING_DIR}/output/network-config ${WORKING_DIR}/backups/${hostname}.${domain}.network-config
+		chmod 640 ${WORKING_DIR}/backups/${hostname}.${domain}.network-config
+	fi
   chmod 640 ${WORKING_DIR}/backups/${hostname}.${domain}.user-data ${WORKING_DIR}/backups/${hostname}.${domain}.meta-data
 fi
 # copy ISO into libvirt's directory