cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject git commit: updated refs/heads/4.4 to d00d281
Date Wed, 14 May 2014 07:05:53 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4 c94158f0f -> d00d28105


CLOUDSTACK-6241: Fix default route for IPv6 network when IPv4 not used
(cherry picked from commit e406adc0810b22ded0964080946f019be1337b52)


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

Branch: refs/heads/4.4
Commit: d00d28105e75b0108ace33361ef11f8e4115f002
Parents: c94158f
Author: Sheng Yang <sheng.yang@citrix.com>
Authored: Fri Mar 14 13:36:43 2014 -0700
Committer: Daan Hoogland <daan@onecht.net>
Committed: Wed May 14 09:02:40 2014 +0200

----------------------------------------------------------------------
 systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d00d2810/systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh b/systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh
index 8e7ddac..70c95a8 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh
+++ b/systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh
@@ -184,7 +184,7 @@ then
   echo "$ipv6 $host" >> $HOSTS
 fi
 
-if [ "$dflt" != "" ]
+if [ "$dflt" != "" -a "$ipv4" != "" ]
 then
   #make sure dnsmasq looks into options file
   sed -i /dhcp-optsfile/d /etc/dnsmasq.conf


Mime
View raw message