diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-11-14 12:32:51 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-11-14 12:32:51 -0800 |
| commit | 6602f49495c94e8533c8b482698bcf570a8d8933 (patch) | |
| tree | 07065424002052ed9e726b4feb689697845ff4a7 /nixos/modules/services/networking/networkmanager.nix | |
| parent | e4feccce818416c39c8e86e6f9ac01674ad98c88 (diff) | |
| download | nixpkgs-6602f49495c94e8533c8b482698bcf570a8d8933.tar nixpkgs-6602f49495c94e8533c8b482698bcf570a8d8933.tar.gz nixpkgs-6602f49495c94e8533c8b482698bcf570a8d8933.tar.bz2 nixpkgs-6602f49495c94e8533c8b482698bcf570a8d8933.tar.lz nixpkgs-6602f49495c94e8533c8b482698bcf570a8d8933.tar.xz nixpkgs-6602f49495c94e8533c8b482698bcf570a8d8933.tar.zst nixpkgs-6602f49495c94e8533c8b482698bcf570a8d8933.zip | |
Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
This reverts commit 741bf840dad05cd1728481045466811ae8ae8281. This reverts the fallout from reverting the major changes.
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 19ff73ad1b8..7df194fa419 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 { |