nixos/user-groups: fixup of 5666a378

rnhmjoj 205b56cf 51078b89

Changed files
+5 -5
nixos
+4 -4
nixos/modules/config/update-users-groups.pl
···
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});
+1 -1
nixos/modules/config/users-groups.nix
···
};
passwordFile = mkOption {
-
type = with types; nullOr (passwdEntry str);
+
type = with types; nullOr str;
default = null;
visible = false;
description = lib.mdDoc "Deprecated alias of hashedPasswordFile";