* Enable IPv6 support by default. (Note that most NixOS systems

already had the ipv6 kernel module loaded, because dhclient needs
  it.)

svn path=/nixos/trunk/; revision=26034
This commit is contained in:
Eelco Dolstra 2011-02-19 17:21:29 +00:00
parent 5bdc1a9db7
commit 9f755eb3a4
2 changed files with 6 additions and 5 deletions

View file

@ -21,7 +21,7 @@ let
default_privs = nobody
''
+ optionalString (config.services.gw6c.enable || config.networking.nativeIPv6) (''
+ optionalString (config.services.gw6c.enable || config.networking.enableIPv6) (''
inet_protocols = all
'')
+ (if cfg.networks != null then

View file

@ -26,11 +26,10 @@ in
'';
};
networking.nativeIPv6 = mkOption {
default = false;
networking.enableIPv6 = mkOption {
default = true;
description = ''
Whether to use IPv6 even though gw6c is not used. For example,
for Postfix.
Whether to enable support for IPv6.
'';
};
@ -145,6 +144,8 @@ in
config = {
boot.kernelModules = optional cfg.enableIPv6 "ipv6";
environment.systemPackages =
[ pkgs.host
pkgs.iproute