cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yas...@apache.org
Subject git commit: updated refs/heads/4.2 to 340e0ad
Date Fri, 14 Mar 2014 20:38:47 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.2 6baa0538a -> 340e0ad8f


CLOUDSTACK-6241: Fix default route for IPv6 network when IPv4 not used


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

Branch: refs/heads/4.2
Commit: 340e0ad8f56b93eb1d989fb7c08be4131619b486
Parents: 6baa053
Author: Sheng Yang <sheng.yang@citrix.com>
Authored: Fri Mar 14 13:36:43 2014 -0700
Committer: Sheng Yang <sheng.yang@citrix.com>
Committed: Fri Mar 14 13:37:48 2014 -0700

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


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