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 1F87DF3F1 for ; Wed, 1 May 2013 21:45:41 +0000 (UTC) Received: (qmail 23034 invoked by uid 500); 1 May 2013 21:45:33 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 22991 invoked by uid 500); 1 May 2013 21:45:33 -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 22097 invoked by uid 99); 1 May 2013 21:45:32 -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, 01 May 2013 21:45:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1FEB8885598; Wed, 1 May 2013 21:45:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: commits@cloudstack.apache.org Date: Wed, 01 May 2013 21:46:12 -0000 Message-Id: <1a6bf6dd09c04b49811285e11b561523@git.apache.org> In-Reply-To: <8f8bf659f541472eb6c52b59517dc0f0@git.apache.org> References: <8f8bf659f541472eb6c52b59517dc0f0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [42/50] [abbrv] git commit: updated refs/heads/ui-granular-settings to c1de600 CLOUDSTACK-2110 : allow vm to have multiple dhcp entries on same router Signed-off-by: Marcus Sorensen 1367439056 -0600 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/71a17e4c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/71a17e4c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/71a17e4c Branch: refs/heads/ui-granular-settings Commit: 71a17e4c139a5c4e4be326e15548e0d6036dfd9a Parents: 471ca30 Author: Marcus Sorensen Authored: Wed May 1 14:10:56 2013 -0600 Committer: Marcus Sorensen Committed: Wed May 1 14:10:56 2013 -0600 ---------------------------------------------------------------------- patches/systemvm/debian/config/root/edithosts.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/71a17e4c/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 1f98fbf..8609da7 100755 --- a/patches/systemvm/debian/config/root/edithosts.sh +++ b/patches/systemvm/debian/config/root/edithosts.sh @@ -113,7 +113,8 @@ if [ $ipv6 ] then sed -i /$ipv6,/d $DHCP_HOSTS fi -sed -i /$host,/d $DHCP_HOSTS +# don't want to do this in the future, we can have same VM with multiple nics/entries +#sed -i /$host,/d $DHCP_HOSTS #put in the new entry