cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jaya...@apache.org
Subject git commit: updated refs/heads/4.2 to 8babd39
Date Mon, 19 Aug 2013 05:47:04 GMT
Updated Branches:
  refs/heads/4.2 76d3cae24 -> 8babd390d


CLOUDSTACK-4132 current dnsmasq config does not allow guest virtual machines(clients) to update
its hostnames with a DNS server

Introducing the option dhcp-client-update fails if the dnsmasq version is less than 2.6 (like
in older templates).
Added a check for the version in cloud-early-config. will add dhcp-client-update option in
the config file only
if the dnsmasq version is 2.6 and above.

Signed-off-by: Jayapal <jayapal@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8babd390
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8babd390
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8babd390

Branch: refs/heads/4.2
Commit: 8babd390d685d60c8183c7e482ce80af334f1d96
Parents: 76d3cae
Author: Bharat Kumar <bharat.kumar@citrix.com>
Authored: Sat Aug 17 10:58:23 2013 +0530
Committer: Jayapal <jayapal@apache.org>
Committed: Mon Aug 19 11:13:17 2013 +0530

----------------------------------------------------------------------
 .../systemvm/debian/config/etc/init.d/cloud-early-config    | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8babd390/patches/systemvm/debian/config/etc/init.d/cloud-early-config
----------------------------------------------------------------------
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 736234c..5aa9621 100755
--- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
+++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
@@ -724,6 +724,15 @@ setup_dnsmasq() {
       then
        echo "$ETH0_IP6 data-server" >> /etc/hosts
   fi
+#add the dhcp-client-update only if dnsmasq version is 2.6 and above
+  dnsmasqVersion=$(dnsmasq -v |  grep version -m 1 | grep -o  "[[:digit:]]\.[[:digit:]]")
+  major=$(echo "$dnsmasqVersion" | cut -d '.' -f 1)
+  minor=$(echo "$dnsmasqVersion" | cut -d '.' -f 2)
+  if [ "$major" -eq '2' -a  "$minor" -ge '6' ] || [ "$major" -gt '2' ]
+  then
+      sed -i -e "/^dhcp-client-update/d" /etc/dnsmasq.conf
+      echo 'dhcp-client-update' >> /etc/dnsmasq.conf
+  fi
 }
 
 setup_sshd(){


Mime
View raw message