lol

nixos/user-groups: fixup of 5666a378

rnhmjoj 205b56cf 51078b89

+5 -5
+4 -4
nixos/modules/config/update-users-groups.pl
··· 239 239 chmod oct($u->{homeMode}), $u->{home}; 240 240 } 241 241 242 - if (defined $u->{passwordFile}) { 243 - if (-e $u->{passwordFile}) { 244 - $u->{hashedPassword} = read_file($u->{passwordFile}); 242 + if (defined $u->{hashedPasswordFile}) { 243 + if (-e $u->{hashedPasswordFile}) { 244 + $u->{hashedPassword} = read_file($u->{hashedPasswordFile}); 245 245 chomp $u->{hashedPassword}; 246 246 } else { 247 - warn "warning: password file ‘$u->{passwordFile}’ does not exist\n"; 247 + warn "warning: password file ‘$u->{hashedPasswordFile}’ does not exist\n"; 248 248 } 249 249 } elsif (defined $u->{password}) { 250 250 $u->{hashedPassword} = hashPassword($u->{password});
+1 -1
nixos/modules/config/users-groups.nix
··· 264 264 }; 265 265 266 266 passwordFile = mkOption { 267 - type = with types; nullOr (passwdEntry str); 267 + type = with types; nullOr str; 268 268 default = null; 269 269 visible = false; 270 270 description = lib.mdDoc "Deprecated alias of hashedPasswordFile";