movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 12:45:27 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge recent master into staging

Browse source 
Hydra: ?compare=1148749

Conflicts (easy):
	nixos/modules/virtualisation/containers.nix
This commit is contained in:
Vladimír Čunát 2014-08-21 15:09:31 +02:00
commit d4e9fd2a90
215 changed files with 3425 additions and 1642 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/config/users-groups.nix
View file

@ -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;