Merge recent master into staging

Hydra: ?compare=1148749 Conflicts (easy): nixos/modules/virtualisation/containers.nix
2014-08-21 15:09:31 +02:00
parent 5c53f22492 2d03fbf752
commit d4e9fd2a90
215 changed files with 3425 additions and 1642 deletions
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -346,7 +346,7 @@ in {
        uid = ids.uids.root;
        description = "System administrator";
        home = "/root";
-        shell = cfg.defaultUserShell;
+        shell = mkDefault cfg.defaultUserShell;
        group = "root";
        extraGroups = [ "grsecurity" ];
        hashedPassword = mkDefault config.security.initialRootPassword;