colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #22727 from mayflower/fix/netdev-master-bindsto

Browse Source 
network-interfaces service: fix bindsTo deps for masters
This commit is contained in:
Franz Pletz 2017-02-18 13:37:50 +01:00 committed by GitHub
commit c4c23f36ca
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
nixos/modules/tasks/network-interfaces-scripted.nix
View File

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