diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-24 16:23:28 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-24 16:23:28 +0000 |
| commit | b2d6dfecbcbf9e518322eab7d88bfaeb7f776184 (patch) | |
| tree | 17029d778eb5dfe7591139319812c77b50b7be67 /modules/tasks | |
| parent | 69c4a662deca38057b69944f1fb9cefac21c895b (diff) | |
| download | nixpkgs-b2d6dfecbcbf9e518322eab7d88bfaeb7f776184.tar nixpkgs-b2d6dfecbcbf9e518322eab7d88bfaeb7f776184.tar.gz nixpkgs-b2d6dfecbcbf9e518322eab7d88bfaeb7f776184.tar.bz2 nixpkgs-b2d6dfecbcbf9e518322eab7d88bfaeb7f776184.tar.lz nixpkgs-b2d6dfecbcbf9e518322eab7d88bfaeb7f776184.tar.xz nixpkgs-b2d6dfecbcbf9e518322eab7d88bfaeb7f776184.tar.zst nixpkgs-b2d6dfecbcbf9e518322eab7d88bfaeb7f776184.zip | |
* Add the rdnss daemon.
* Add the ndisc6 package to the system path if IPv6 is enabled. svn path=/nixos/trunk/; revision=26496
Diffstat (limited to 'modules/tasks')
| -rw-r--r-- | modules/tasks/network-interfaces.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix index eb94315b063..ac98e385ce1 100644 --- a/modules/tasks/network-interfaces.nix +++ b/modules/tasks/network-interfaces.nix @@ -179,7 +179,9 @@ in pkgs.nettools pkgs.wirelesstools pkgs.rfkill - ] ++ optional (cfg.bridges != {}) [ pkgs.bridge_utils ]; + ] + ++ optional (cfg.bridges != {}) pkgs.bridge_utils + ++ optional cfg.enableIPv6 pkgs.ndisc6; security.setuidPrograms = [ "ping" "ping6" ]; |