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 583F118F22 for ; Wed, 19 Aug 2015 16:13:49 +0000 (UTC) Received: (qmail 95982 invoked by uid 500); 19 Aug 2015 16:13:43 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 95948 invoked by uid 500); 19 Aug 2015 16:13:43 -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 95939 invoked by uid 99); 19 Aug 2015 16:13:43 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Aug 2015 16:13:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DB543DFA25; Wed, 19 Aug 2015 16:13:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Message-Id: <074e6a83480941b6a12cc5aad7cfb980@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 3fd35dd Date: Wed, 19 Aug 2015 16:13:42 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/master b913c881a -> 3fd35dd4a CLOUDSTACK-8749: KVM - cleanup linklocal interface based on names This tries to avoid cleaning by a device name. This closes #718 (cherry picked from commit 74f697a2dd6e2630fa1fa5949e41c7d539015fbf) Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3fd35dd4 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3fd35dd4 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3fd35dd4 Branch: refs/heads/master Commit: 3fd35dd4a7bc16e83d09077418739e85050b3eed Parents: b913c88 Author: Rohit Yadav Authored: Wed Aug 19 15:38:31 2015 +0530 Committer: Rohit Yadav Committed: Wed Aug 19 21:43:24 2015 +0530 ---------------------------------------------------------------------- .../kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fd35dd4/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java index aaf75ff..dbc079d 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java @@ -287,7 +287,7 @@ public class BridgeVifDriver extends VifDriverBase { for (String line : lines) { String[] tokens = line.split(" "); if (!tokens[2].equalsIgnoreCase(linkLocalBr)) { - Script.runSimpleBashScript("ip route del " + NetUtils.getLinkLocalCIDR()); + Script.runSimpleBashScript("ip route del " + NetUtils.getLinkLocalCIDR() + " dev " + tokens[2]); } else { foundLinkLocalBr = true; }