cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anim...@apache.org
Subject [3/6] git commit: updated refs/heads/4.3 to 0810029
Date Mon, 17 Mar 2014 23:42:37 GMT
CLOUDSTACK-6241: Fix default route for IPv6 network when IPv4 not used
(cherry picked from commit e406adc0810b22ded0964080946f019be1337b52)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>


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

Branch: refs/heads/4.3
Commit: cd2ba90fae7acd31e6f459154ef096b65c7345f2
Parents: 5973a42
Author: Sheng Yang <sheng.yang@citrix.com>
Authored: Fri Mar 14 13:36:43 2014 -0700
Committer: Animesh Chaturvedi <animesh@apache.org>
Committed: Mon Mar 17 16:20:09 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cd2ba90f/systemvm/patches/debian/config/root/edithosts.sh
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/root/edithosts.sh b/systemvm/patches/debian/config/root/edithosts.sh
index d6ff983..57ee7dc 100755
--- a/systemvm/patches/debian/config/root/edithosts.sh
+++ b/systemvm/patches/debian/config/root/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