colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/user-groups: fixup of 5666a378

Browse Source
This commit is contained in:
rnhmjoj 2023-09-13 11:43:19 +02:00
parent 51078b896c
commit 205b56cffc
No known key found for this signature in database
GPG Key ID: BFBAF4C975F76450
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/config/update-users-groups.pl
View File

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

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

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