mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 15:11:25 +00:00
nixos/user-groups: fixup of 5666a378
This commit is contained in:
parent
51078b896c
commit
205b56cffc
@ -239,12 +239,12 @@ foreach my $u (@{$spec->{users}}) {
|
||||
chmod oct($u->{homeMode}), $u->{home};
|
||||
}
|
||||
|
||||
if (defined $u->{passwordFile}) {
|
||||
if (-e $u->{passwordFile}) {
|
||||
$u->{hashedPassword} = read_file($u->{passwordFile});
|
||||
if (defined $u->{hashedPasswordFile}) {
|
||||
if (-e $u->{hashedPasswordFile}) {
|
||||
$u->{hashedPassword} = read_file($u->{hashedPasswordFile});
|
||||
chomp $u->{hashedPassword};
|
||||
} else {
|
||||
warn "warning: password file ‘$u->{passwordFile}’ does not exist\n";
|
||||
warn "warning: password file ‘$u->{hashedPasswordFile}’ does not exist\n";
|
||||
}
|
||||
} elsif (defined $u->{password}) {
|
||||
$u->{hashedPassword} = hashPassword($u->{password});
|
||||
|
@ -264,7 +264,7 @@ let
|
||||
};
|
||||
|
||||
passwordFile = mkOption {
|
||||
type = with types; nullOr (passwdEntry str);
|
||||
type = with types; nullOr str;
|
||||
default = null;
|
||||
visible = false;
|
||||
description = lib.mdDoc "Deprecated alias of hashedPasswordFile";
|
||||
|
Loading…
Reference in New Issue
Block a user