Skip to content

Commit 4c8fd89

Browse files
Merge pull request #49 from simonjbeaumont/ca-151464
CA-151464: Don't assume interface is bonded if master sysfs key exists
2 parents bc0140f + aab72b5 commit 4c8fd89

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

lib/network_utils.ml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,8 +456,11 @@ module Linux_bonding = struct
456456

457457
let get_bond_master_of slave =
458458
try
459-
let path = Unix.readlink (Sysfs.getpath slave "master") in
460-
Some (List.hd (List.rev (String.split '/' path)))
459+
let master_symlink = Sysfs.getpath slave "master" in
460+
let master_path = Unix.readlink master_symlink in
461+
let slaves_path = Filename.concat master_symlink "bonding/slaves" in
462+
Unix.access slaves_path [ Unix.F_OK ];
463+
Some (List.hd (List.rev (String.split '/' master_path)))
461464
with _ -> None
462465
end
463466

0 commit comments

Comments
 (0)