incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mlsoren...@apache.org
Subject [28/50] git commit: Summary: Account for embedded nics (e.g. 'em0') when looking for physical nic
Date Wed, 30 Jan 2013 20:55:08 GMT
Summary: Account for embedded nics (e.g. 'em0') when looking for physical nic

Signed-off-by: Marcus Sorensen <marcus@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/482ce5fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/482ce5fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/482ce5fe

Branch: refs/heads/add_remove_nics
Commit: 482ce5fe0769ff8adc7be8d29bb4d6fe314cecb1
Parents: cb8705c
Author: Marcus Sorensen <marcus@betterservers.com>
Authored: Mon Jan 28 21:21:30 2013 -0700
Committer: Marcus Sorensen <marcus@betterservers.com>
Committed: Mon Jan 28 21:21:30 2013 -0700

----------------------------------------------------------------------
 .../kvm/resource/LibvirtComputingResource.java     |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/482ce5fe/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;
             }
         }


Mime
View raw message