Merge pull request #22727 from mayflower/fix/netdev-master-bindsto
network-interfaces service: fix bindsTo deps for masters
This commit is contained in:
commit
c4c23f36ca
@ -60,21 +60,18 @@ let
|
|||||||
let
|
let
|
||||||
|
|
||||||
deviceDependency = dev:
|
deviceDependency = dev:
|
||||||
if (config.boot.isContainer == false)
|
# Use systemd service if we manage device creation, else
|
||||||
then
|
# trust udev when not in a container
|
||||||
# Trust udev when not in the container
|
if (hasAttr dev (filterAttrs (k: v: v.virtual) cfg.interfaces)) ||
|
||||||
optional (dev != null) (subsystemDevice dev)
|
(hasAttr dev cfg.bridges) ||
|
||||||
else
|
(hasAttr dev cfg.bonds) ||
|
||||||
# When in the container, check whether the interface is built from other definitions
|
(hasAttr dev cfg.macvlans) ||
|
||||||
if (hasAttr dev cfg.bridges) ||
|
(hasAttr dev cfg.sits) ||
|
||||||
(hasAttr dev cfg.bonds) ||
|
(hasAttr dev cfg.vlans) ||
|
||||||
(hasAttr dev cfg.macvlans) ||
|
(hasAttr dev cfg.vswitches) ||
|
||||||
(hasAttr dev cfg.sits) ||
|
(hasAttr dev cfg.wlanInterfaces)
|
||||||
(hasAttr dev cfg.vlans) ||
|
then [ "${dev}-netdev.service" ]
|
||||||
(hasAttr dev cfg.vswitches) ||
|
else optional (dev != null && !config.boot.isContainer) (subsystemDevice dev);
|
||||||
(hasAttr dev cfg.wlanInterfaces)
|
|
||||||
then [ "${dev}-netdev.service" ]
|
|
||||||
else [];
|
|
||||||
|
|
||||||
networkLocalCommands = {
|
networkLocalCommands = {
|
||||||
after = [ "network-setup.service" ];
|
after = [ "network-setup.service" ];
|
||||||
@ -211,7 +208,7 @@ let
|
|||||||
user "${i.virtualOwner}"
|
user "${i.virtualOwner}"
|
||||||
'';
|
'';
|
||||||
postStop = ''
|
postStop = ''
|
||||||
ip link del ${i.name}
|
ip link del ${i.name} || true
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -349,7 +346,7 @@ let
|
|||||||
ip link set "${n}" up
|
ip link set "${n}" up
|
||||||
'';
|
'';
|
||||||
postStop = ''
|
postStop = ''
|
||||||
ip link delete "${n}"
|
ip link delete "${n}" || true
|
||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -377,7 +374,7 @@ let
|
|||||||
ip link set "${n}" up
|
ip link set "${n}" up
|
||||||
'';
|
'';
|
||||||
postStop = ''
|
postStop = ''
|
||||||
ip link delete "${n}"
|
ip link delete "${n}" || true
|
||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -401,7 +398,7 @@ let
|
|||||||
ip link set "${n}" up
|
ip link set "${n}" up
|
||||||
'';
|
'';
|
||||||
postStop = ''
|
postStop = ''
|
||||||
ip link delete "${n}"
|
ip link delete "${n}" || true
|
||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user