From 2510bf03f6d6b755fc82765c0363c2df43e4e401 Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Thu, 2 May 2013 19:58:39 -0700 Subject: [PATCH] CLOUDSTACK-2044: Use dnsmasq.conf.tmpl to generate dnsmasq.conf We add something like dhcp-range_ip4/ip6 in the template for implementing different setups. --- .../debian/config/etc/{dnsmasq.conf => dnsmasq.conf.tmpl} | 0 patches/systemvm/debian/config/etc/init.d/cloud-early-config | 3 +++ 2 files changed, 3 insertions(+) rename patches/systemvm/debian/config/etc/{dnsmasq.conf => dnsmasq.conf.tmpl} (100%) diff --git a/patches/systemvm/debian/config/etc/dnsmasq.conf b/patches/systemvm/debian/config/etc/dnsmasq.conf.tmpl similarity index 100% rename from patches/systemvm/debian/config/etc/dnsmasq.conf rename to patches/systemvm/debian/config/etc/dnsmasq.conf.tmpl diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config b/patches/systemvm/debian/config/etc/init.d/cloud-early-config index 6ffd648faeb..ed3894f61cb 100755 --- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config +++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config @@ -442,6 +442,9 @@ setup_dnsmasq() { [ -z $DHCP_RANGE ] && [ $ETH0_IP ] && DHCP_RANGE=$ETH0_IP [ $ETH0_IP6 ] && DHCP_RANGE_IP6=$ETH0_IP6 [ -z $DOMAIN ] && DOMAIN="cloudnine.internal" + + #get the template + cp /etc/dnsmasq.conf.tmpl /etc/dnsmasq.conf if [ -n "$DOMAIN" ] then