Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 29F4E113C9 for ; Wed, 14 May 2014 08:05:54 +0000 (UTC) Received: (qmail 78089 invoked by uid 500); 14 May 2014 07:05:54 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 78071 invoked by uid 500); 14 May 2014 07:05:54 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 78064 invoked by uid 99); 14 May 2014 07:05:54 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 May 2014 07:05:54 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CAACE8B959C; Wed, 14 May 2014 07:05:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dahn@apache.org To: commits@cloudstack.apache.org Message-Id: <559c9e5a3490486e94ee5434a14fcdac@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.4 to d00d281 Date: Wed, 14 May 2014 07:05:53 +0000 (UTC) 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 Authored: Fri Mar 14 13:36:43 2014 -0700 Committer: Daan Hoogland 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