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

Merge pull request #254919 from rnhmjoj/pr-password

Browse Source 
nixos/user-groups: fixup of 5666a378
This commit is contained in:
pennae 2023-09-13 19:27:52 +02:00 committed by GitHub
commit 0af23b2c3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 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";

2
nixos/tests/shadow.nix
View File

@ -32,7 +32,7 @@ in import ./make-test-python.nix ({ pkgs, ... }: {
};
users.berta = {
isNormalUser = true;
hashedPassword = hashed_bcrypt;
hashedPasswordFile = (pkgs.writeText "hashed_bcrypt" hashed_bcrypt).outPath;
shell = pkgs.bash;
};
users.yesim = {