Summary: Account for embedded nics (e.g. 'em0') when looking for physical nic

Marcus Sorensen · Marcus Sorensen · commit 482ce5fe0769 · 2013-01-28T21:21:30.000-07:00
Signed-off-by: Marcus Sorensen &lt;marcus@betterservers.com&gt;
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
@@ -903,7 +903,7 @@ private String matchPifFileInDirectory(String bridgeName){
             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;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -903,7 +903,7 @@ private String matchPifFileInDirectory(String bridgeName){`
`903`	`903`	`String fname = interfaces[i].getName();`
`904`	`904`	`s_logger.debug("matchPifFileInDirectory: file name '"+fname+"'");`
`905`	`905`	`if (fname.startsWith("eth") \|\| fname.startsWith("bond")`
`906`		`- \|\| fname.startsWith("vlan")) {`
	`906`	`+ \|\| fname.startsWith("vlan") \|\| fname.startsWith("em")) {`
`907`	`907`	`return fname;`
`908`	`908`	`}`
`909`	`909`	`}`