Merge pull request #49 from simonjbeaumont/ca-151464

CA-151464: Don't assume interface is bonded if master sysfs key exists
xapi-project · Jan 9, 2015 · 4c8fd89 · 4c8fd89
2 parents bc0140f + aab72b5
commit 4c8fd89
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/lib/network_utils.ml b/lib/network_utils.ml
@@ -456,8 +456,11 @@ module Linux_bonding = struct
 
 	let get_bond_master_of slave =
 		try
-			let path = Unix.readlink (Sysfs.getpath slave "master") in
-			Some (List.hd (List.rev (String.split '/' path)))
+			let master_symlink = Sysfs.getpath slave "master" in
+			let master_path = Unix.readlink master_symlink in
+			let slaves_path = Filename.concat master_symlink "bonding/slaves" in
+			Unix.access slaves_path [ Unix.F_OK ];
+			Some (List.hd (List.rev (String.split '/' master_path)))
 		with _ -> None
 end