You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ya...@apache.org on 2013/02/01 00:08:02 UTC
[12/28] git commit: refs/heads/master - Summary: Account for embedded
nics (e.g. 'em0') when looking for physical nic
Summary: Account for embedded nics (e.g. 'em0') when looking for physical nic
Signed-off-by: Marcus Sorensen <ma...@betterservers.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/1f2147d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/1f2147d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/1f2147d3
Branch: refs/heads/master
Commit: 1f2147d3ec4760c7aafb13f1107ece8d0f448f8b
Parents: 2cbca37
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Mon Jan 28 21:21:30 2013 -0700
Committer: Sheng Yang <sh...@citrix.com>
Committed: Mon Jan 28 21:20:03 2013 -0800
----------------------------------------------------------------------
.../kvm/resource/LibvirtComputingResource.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1f2147d3/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 8a9f71b..2ed8478 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -903,7 +903,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements
String fname = interfaces[i].getName();
s_logger.debug("matchPifFileInDirectory: file name '"+fname+"'");
if (fname.startsWith("eth") || fname.startsWith("bond")
- || fname.startsWith("vlan")) {
+ || fname.startsWith("vlan") || fname.startsWith("em")) {
return fname;
}
}