All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit e3a2d756 authored by David Johnson's avatar David Johnson

Bug fix: don't add macvlan device if it already exists.

parent 72fb9e3a
......@@ -1411,7 +1411,9 @@ sub vz_vnodePreConfigExpNetwork {
# or atop the physical or vlan device.
#
my $vname = "mv$vmid.$ifc->{ID}";
mysystem("$IP link add link $physdev name $vname address $vethmac type macvlan mode bridge ");
if (! -d "/sys/class/net/$vname") {
mysystem("$IP link add link $physdev name $vname address $vethmac type macvlan mode bridge ");
}
mysystem("$VZCTL $VZDEBUGOPTS set $vnode_id --netdev_add $vname --save");
}
else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment