@@ -415,6 +415,12 @@ in {
415415 imports = [
416416 (mkAliasOptionModule [ "users" "extraUsers" ] [ "users" "users" ])
417417 (mkAliasOptionModule [ "users" "extraGroups" ] [ "users" "groups" ])
418+ (mkChangedOptionModule
419+ [ "security" "initialRootPassword" ]
420+ [ "users" "users" "root" "initialHashedPassword" ]
421+ (cfg: if cfg.security.initialHashedPassword == "!"
422+ then null
423+ else cfg.security.initialHashedPassword))
418424 ];
419425
420426 ###### interface
@@ -486,14 +492,6 @@ in {
486492 '';
487493 };
488494
489− # FIXME: obsolete - will remove.
490− security.initialRootPassword = mkOption {
491− type = types.str;
492− default = "!";
493− example = "";
494− visible = false;
495− };
496−
497495 };
498496
499497
@@ -508,7 +506,6 @@ in {
508506 home = "/root";
509507 shell = mkDefault cfg.defaultUserShell;
510508 group = "root";
511− initialHashedPassword = mkDefault config.security.initialRootPassword;
512509 };
513510 nobody = {
514511 uid = ids.uids.nobody;
@@ -597,7 +594,7 @@ in {
597594 || cfg.group == "wheel"
598595 || elem "wheel" cfg.extraGroups)
599596 &&
600− ((cfg.hashedPassword != null && cfg.hashedPassword != "!")
597+ (cfg.hashedPassword != null
601598 || cfg.password != null
602599 || cfg.passwordFile != null
603600 || cfg.openssh.authorizedKeys.keys != []