diff options
| author | rnhmjoj <rnhmjoj@inventati.org> | 2023-09-13 11:43:19 +0200 |
|---|---|---|
| committer | rnhmjoj <rnhmjoj@inventati.org> | 2023-09-13 11:44:19 +0200 |
| commit | 205b56cffc54f7e9626595429bd407902fc7b04a (patch) | |
| tree | bf82ce9eae5c6839d01ce558104f42b52a6f92ee /nixos/modules/config | |
| parent | 51078b896cc40847d7621112422e20bdc6ec4687 (diff) | |
| download | nixlib-205b56cffc54f7e9626595429bd407902fc7b04a.tar nixlib-205b56cffc54f7e9626595429bd407902fc7b04a.tar.gz nixlib-205b56cffc54f7e9626595429bd407902fc7b04a.tar.bz2 nixlib-205b56cffc54f7e9626595429bd407902fc7b04a.tar.lz nixlib-205b56cffc54f7e9626595429bd407902fc7b04a.tar.xz nixlib-205b56cffc54f7e9626595429bd407902fc7b04a.tar.zst nixlib-205b56cffc54f7e9626595429bd407902fc7b04a.zip | |
nixos/user-groups: fixup of 5666a378
Diffstat (limited to 'nixos/modules/config')
| -rw-r--r-- | nixos/modules/config/update-users-groups.pl | 8 | ||||
| -rw-r--r-- | nixos/modules/config/users-groups.nix | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl index 3785ba8c5fb8..7c6851473f42 100644 --- a/nixos/modules/config/update-users-groups.pl +++ b/nixos/modules/config/update-users-groups.pl @@ -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}); diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 4893d28924eb..5158974c27b3 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -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"; |