Skip to content

Commit c2756c6

Browse files
authored
CP-44103: Ordering network devices (#6381)
This part sorts host network devices in xcp-networkd. Previously, the ordering was handled by the interface-rename functionality. This will now be replaced by an equivalent function in xcp-networkd, but without renaming the network devices. The renmaing performed by the interface-rename was used to record the sorting result as the name of the NICs like "eth<N>". Now the sorting result will be recorded as internal files.
2 parents e0d3512 + bdb023a commit c2756c6

12 files changed

+1943
-1
lines changed

ocaml/networkd/lib/dune

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
(libraries
55
astring
66
forkexec
7+
macaddr
78
mtime
89
mtime.clock.os
910
re
@@ -19,6 +20,7 @@
1920
xapi-stdext-threads
2021
xapi-stdext-unix
2122
xapi-inventory
23+
xapi-idl
2224
xapi-idl.network
2325
xapi-log
2426
xapi-open-uri

ocaml/networkd/lib/network_config.ml

+1
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ let read_management_conf () =
187187
; bridge_config
188188
; gateway_interface= Some bridge_name
189189
; dns_interface= Some bridge_name
190+
; interface_order= None
190191
}
191192
with e ->
192193
error "Error while trying to read firstboot data: %s\n%s"

0 commit comments

Comments
 (0)