diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-21 15:09:31 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-21 15:09:31 +0200 |
| commit | d4e9fd2a906b5227ae51a522a0708a0b6884ed1c (patch) | |
| tree | ca6bb53bb064b71b5ad9bf94dbcc27c47c2d652c /nixos/modules/config/users-groups.nix | |
| parent | 5c53f22492511d1d8de46ecd8f11fca20f1287fd (diff) | |
| parent | 2d03fbf75202272f37bf648d06922c2c624f126a (diff) | |
Merge recent master into staging
Hydra: ?compare=1148749
Conflicts (easy):
nixos/modules/virtualisation/containers.nix
Diffstat (limited to 'nixos/modules/config/users-groups.nix')
| -rw-r--r-- | nixos/modules/config/users-groups.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index f32138a814dd..afedc8e382e5 100644 --- 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; |