no message

master
Brie Bruns 2018-05-15 14:36:54 -06:00
parent daa8634170
commit 4e6f63bd08
2 changed files with 7 additions and 5 deletions

View File

@ -37,4 +37,6 @@ packages:
runcmd:
- [ touch, /etc/cloud/cloud-init.disabled ]
bootcmd:
- [ mv, -f, /etc/network/interfaces.d/50-cloud-init.cfg, /etc/network/interfaces ]
- 'mv -f /etc/network/interfaces.d/50-cloud-init.cfg /etc/network/interfaces'
- 'echo -e "domain %DOMAIN%\nsearch %DOMAIN%\nnameserver %NAMESERVER1%\nnameserver %NAMESERVER2%" >/etc/resolv.conf'

View File

@ -117,8 +117,8 @@ arch="amd64"
source distros
sed -e "s/%GUEST_NAME%/${hostname}/" ${WORKING_DIR}/meta-data > ${WORKING_DIR}/output/meta-data
sed -e "s/%FQDN%/${hostname}.${domain}/" -e "s/%DOMAIN%/${domain}/" -e "s/%NAMESERVER1%/${nameserver1}/" -e "s/%NAMESERVER2%/${nameserver2}/" ${WORKING_DIR}/user-data > ${WORKING_DIR}/output/user-data
sed -e "s/%GUEST_NAME%/${hostname}/g" ${WORKING_DIR}/meta-data > ${WORKING_DIR}/output/meta-data
sed -e "s/%FQDN%/${hostname}.${domain}/g" -e "s/%DOMAIN%/${domain}/g" -e "s/%NAMESERVER1%/${nameserver1}/g" -e "s/%NAMESERVER2%/${nameserver2}/g" ${WORKING_DIR}/user-data > ${WORKING_DIR}/output/user-data
if [[ ${virt_netinfo_type} == "eni" ]]; then
cat ${WORKING_DIR}/network/legacy-eni >> ${WORKING_DIR}/output/meta-data
@ -135,8 +135,8 @@ elif [[ $virt_netinfo_type == "1" ]]; 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"
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/%NAMESERVER1%/${nameserver1}/" -e "s/%NAMESERVER2%/${nameserver2}/" \
sed -e "s/%DOMAIN%/${domain}/g" -e "s/%IP_ADDRESS%/${virt_netinfo_address}/g" -e "s/%NETMASK%/${virt_netinfo_netmask}/g" \
-e "s/%GATEWAY%/${virt_netinfo_gateway}/g" -e "s/%NAMESERVER1%/${nameserver1}/g" -e "s/%NAMESERVER2%/${nameserver2}/g" \
${WORKING_DIR}/network/network-config-v1 > ${WORKING_DIR}/output/network-config
extra_iso_files_xorriso=" -map $WORKING_DIR/output/network-config network-config"
extra_iso_files_genisoimage="${WORKING_DIR}/output/network-config"