diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-11-14 12:39:32 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-11-14 12:39:32 -0800 |
| commit | 453f7c7218dfb5788f91f9cecae4a4d3cf650af6 (patch) | |
| tree | bd3f745c9487b6e8d786fc80b5ab5066c0360cb3 /nixos/modules/services/networking/networkmanager.nix | |
| parent | fc8562c78590f269d9bf35f64ec21bdc5b3612c5 (diff) | |
| parent | 6e18a33183006514021f63baebb78a502bdff8aa (diff) | |
| download | nixlib-453f7c7218dfb5788f91f9cecae4a4d3cf650af6.tar nixlib-453f7c7218dfb5788f91f9cecae4a4d3cf650af6.tar.gz nixlib-453f7c7218dfb5788f91f9cecae4a4d3cf650af6.tar.bz2 nixlib-453f7c7218dfb5788f91f9cecae4a4d3cf650af6.tar.lz nixlib-453f7c7218dfb5788f91f9cecae4a4d3cf650af6.tar.xz nixlib-453f7c7218dfb5788f91f9cecae4a4d3cf650af6.tar.zst nixlib-453f7c7218dfb5788f91f9cecae4a4d3cf650af6.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'nixos/modules/services/networking/networkmanager.nix')
| -rw-r--r-- | nixos/modules/services/networking/networkmanager.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 19ff73ad1b87..7df194fa419b 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -72,11 +72,10 @@ let ${coreutils}/bin/rm -f $tmp $tmp.ns ''; - # pre-up and pre-down hooks were added in NM 0.9.10, but we still use 0.9.0 dispatcherTypesSubdirMap = { "basic" = ""; - /*"pre-up" = "pre-up.d/"; - "pre-down" = "pre-down.d/";*/ + "pre-up" = "pre-up.d/"; + "pre-down" = "pre-down.d/"; }; in { |