From: Rob Hoes <rob.hoes@citrix.com>
Date: Fri, 18 Jun 2010 13:32:23 +0000 (+0100)
Subject: Add biosdevname call to Netdev
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=91977ac530ba8d2eb821981b5a51788caaab2bb8;p=xcp%2Fxen-api-libs.git

Add biosdevname call to Netdev

biosdevname is a tool used to find out the "real" device name of a network interface, according to the BIOS. This name is not affected by manual device renaming or changes in the Linux kernel.

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>

diff -r 96761a1835c1 netdev/netdev.ml--- a/netdev/netdev.ml
+++ b/netdev/netdev.ml
@@ -397,6 +397,13 @@
 	not(List.mem "xen-backend" (String.split '/' link))
   with _ -> false

+let get_bios_name name =
+	try
+		let output, _ = Forkhelpers.execute_command_get_output "/sbin/biosdevname" ["-i"; name] in
+		let output = String.strip String.isspace output in
+		output
+	with _ -> name
+
 (* Dispatch network backend operations. *)

 let network_config_file = "/etc/xensource/network.conf"
---

diff --git a/netdev/netdev.ml b/netdev/netdev.ml
index 768dd3b..1f09409 100644
--- a/netdev/netdev.ml
+++ b/netdev/netdev.ml
@@ -397,6 +397,13 @@ let is_physical name =
 	not(List.mem "xen-backend" (String.split '/' link))
   with _ -> false
 
+let get_bios_name name =
+	try
+		let output, _ = Forkhelpers.execute_command_get_output "/sbin/biosdevname" ["-i"; name] in
+		let output = String.strip String.isspace output in
+		output
+	with _ -> name
+
 (* Dispatch network backend operations. *)
 
 let network_config_file = "/etc/xensource/network.conf"