diff options
| author | Bas van Dijk <v.dijk.bas@gmail.com> | 2017-10-30 17:35:14 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@enlambda.com> | 2017-10-30 20:45:32 +0100 |
| commit | 07e0c0e0a2f237639600f2a0d62f6eac748b1e6e (patch) | |
| tree | 38649051d5de946b773b1d440e253d5e9631fa72 /nixos/modules/tasks | |
| parent | cd976095fe73b7740136e54f8b37d61813e6e4a9 (diff) | |
| download | nixlib-07e0c0e0a2f237639600f2a0d62f6eac748b1e6e.tar nixlib-07e0c0e0a2f237639600f2a0d62f6eac748b1e6e.tar.gz nixlib-07e0c0e0a2f237639600f2a0d62f6eac748b1e6e.tar.bz2 nixlib-07e0c0e0a2f237639600f2a0d62f6eac748b1e6e.tar.lz nixlib-07e0c0e0a2f237639600f2a0d62f6eac748b1e6e.tar.xz nixlib-07e0c0e0a2f237639600f2a0d62f6eac748b1e6e.tar.zst nixlib-07e0c0e0a2f237639600f2a0d62f6eac748b1e6e.zip | |
network-interfaces-scripted: fix NixOS/nixops#640
Reverse the PartOf dependency between network-setup and network-addresses-* This was joint work of: @nh2, @domenkozar, @fpletz, @aszlig and @basvandijk at the NixCon 2017 hackathon.
Diffstat (limited to 'nixos/modules/tasks')
| -rw-r--r-- | nixos/modules/tasks/network-interfaces-scripted.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index e92c9bc27def..1f424f84c6e0 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -93,6 +93,7 @@ let after = [ "network-pre.target" "systemd-udevd.service" "systemd-sysctl.service" ]; before = [ "network.target" "shutdown.target" ]; wants = [ "network.target" ]; + partOf = map (i: "network-addresses-${i.name}.service") interfaces; conflicts = [ "shutdown.target" ]; wantedBy = [ "multi-user.target" ] ++ optional hasDefaultGatewaySet "network-online.target"; @@ -171,8 +172,6 @@ let "network-link-${i.name}.service" "network.target" ]; - # propagate stop and reload from network-setup - partOf = [ "network-setup.service" ]; # order before network-setup because the routes that are configured # there may need ip addresses configured before = [ "network-setup.service" ]; |