commit 6c3d21aff953a2f61086fa9dfd22ccaa919910f0 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix

···

       104
       104
        
           '';

     

       105
       105
        
       

     

       106
       106
        
         # Some more help text.

     

       107
       107
       -
         services.mingetty.helpLine =

     

       107
       107
       +
         services.getty.helpLine =

     

       108
       108
        
           ''

     

       109
       109
        
       

     

       110
       110
        
             Log in as "root" with an empty password.  ${

+1 -1

nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix

···

       122
       122
        
             device = "/dev/something";

     

       123
       123
        
           };

     

       124
       124
        
       

     

       125
       125
       -
         services.mingetty = {

     

       125
       125
       +
         services.getty = {

     

       126
       126
        
           # Some more help text.

     

       127
       127
        
           helpLine = ''

     

       128
       128
        
             Log in as "root" with an empty password.  ${

+1 -1

nixos/modules/misc/documentation.nix

···

       261
       261
        
               ++ optionals cfg.doc.enable ([ manual.manualHTML nixos-help ]

     

       262
       262
        
                  ++ optionals config.services.xserver.enable [ pkgs.nixos-icons ]);

     

       263
       263
        
       

     

       264
       264
       -
             services.mingetty.helpLine = mkIf cfg.doc.enable (

     

       264
       264
       +
             services.getty.helpLine = mkIf cfg.doc.enable (

     

       265
       265
        
                 "\nRun 'nixos-help' for the NixOS manual."

     

       266
       266
        
             );

     

       267
       267
        
           })

+1 -1

nixos/modules/module-list.nix

···

       852
       852
        
         ./services/torrent/peerflix.nix

     

       853
       853
        
         ./services/torrent/rtorrent.nix

     

       854
       854
        
         ./services/torrent/transmission.nix

     

       855
       855
       -
         ./services/ttys/agetty.nix

     

       855
       855
       +
         ./services/ttys/getty.nix

     

       856
       856
        
         ./services/ttys/gpm.nix

     

       857
       857
        
         ./services/ttys/kmscon.nix

     

       858
       858
        
         ./services/wayland/cage.nix

+2 -2

nixos/modules/profiles/installation-device.nix

···

       45
       45
        
           };

     

       46
       46
        
       

     

       47
       47
        
           # Automatically log in at the virtual consoles.

     

       48
       48
       -
           services.mingetty.autologinUser = "nixos";

     

       48
       48
       +
           services.getty.autologinUser = "nixos";

     

       49
       49
        
       

     

       50
       50
        
           # Some more help text.

     

       51
       51
       -
           services.mingetty.helpLine = ''

     

       51
       51
       +
           services.getty.helpLine = ''

     

       52
       52
        
             The "nixos" and "root" accounts have empty passwords.

     

       53
       53
        
       

     

       54
       54
        
             An ssh daemon is running. You then must set a password

+12 -8

nixos/modules/services/ttys/agetty.nix nixos/modules/services/ttys/getty.nix

···

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
        
       

     

       7
       7
       -
         autologinArg = optionalString (config.services.mingetty.autologinUser != null) "--autologin ${config.services.mingetty.autologinUser}";

     

       7
       7
       +
         autologinArg = optionalString (config.services.getty.autologinUser != null) "--autologin ${config.services.getty.autologinUser}";

     

       8
       8
        
         gettyCmd = extraArgs: "@${pkgs.util-linux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login ${autologinArg} ${extraArgs}";

     

       9
       9
        
       

     

       10
       10
        
       in

     
···

       13
       13
        
       

     

       14
       14
        
         ###### interface

     

       15
       15
        
       

     

       16
       16
       +
         imports = [

     

       17
       17
       +
           (mkRenamedOptionModule [ "services" "mingetty" ] [ "services" "getty" ])

     

       18
       18
       +
         ];

     

       19
       19
       +
       

     

       16
       20
        
         options = {

     

       17
       21
        
       

     

       18
       18
       -
           services.mingetty = {

     

       22
       22
       +
           services.getty = {

     

       19
       23
        
       

     

       20
       24
        
             autologinUser = mkOption {

     

       21
       25
        
               type = types.nullOr types.str;

     
···

       29
       33
        
             greetingLine = mkOption {

     

       30
       34
        
               type = types.str;

     

       31
       35
        
               description = ''

     

       32
       32
       -
                 Welcome line printed by mingetty.

     

       36
       36
       +
                 Welcome line printed by agetty.

     

       33
       37
        
                 The default shows current NixOS version label, machine type and tty.

     

       34
       38
        
               '';

     

       35
       39
        
             };

     
···

       38
       42
        
               type = types.lines;

     

       39
       43
        
               default = "";

     

       40
       44
        
               description = ''

     

       41
       41
       -
                 Help line printed by mingetty below the welcome line.

     

       45
       45
       +
                 Help line printed by agetty below the welcome line.

     

       42
       46
        
                 Used by the installation CD to give some hints on

     

       43
       47
        
                 how to proceed.

     

       44
       48
        
               '';

     
···

       65
       69
        
         config = {

     

       66
       70
        
           # Note: this is set here rather than up there so that changing

     

       67
       71
        
           # nixos.label would not rebuild manual pages

     

       68
       68
       -
           services.mingetty.greetingLine = mkDefault ''<<< Welcome to NixOS ${config.system.nixos.label} (\m) - \l >>>'';

     

       72
       72
       +
           services.getty.greetingLine = mkDefault ''<<< Welcome to NixOS ${config.system.nixos.label} (\m) - \l >>>'';

     

       69
       73
        
       

     

       70
       74
        
           systemd.services."getty@" =

     

       71
       75
        
             { serviceConfig.ExecStart = [

     
···

       76
       80
        
             };

     

       77
       81
        
       

     

       78
       82
        
           systemd.services."serial-getty@" =

     

       79
       79
       -
             let speeds = concatStringsSep "," (map toString config.services.mingetty.serialSpeed); in

     

       83
       83
       +
             let speeds = concatStringsSep "," (map toString config.services.getty.serialSpeed); in

     

       80
       84
        
             { serviceConfig.ExecStart = [

     

       81
       85
        
                 "" # override upstream default with an empty ExecStart

     

       82
       86
        
                 (gettyCmd "%I ${speeds} $TERM")

     
···

       106
       110
        
             { # Friendly greeting on the virtual consoles.

     

       107
       111
        
               source = pkgs.writeText "issue" ''

     

       108
       112
        
       

     

       109
       109
       -
                 [1;32m${config.services.mingetty.greetingLine}[0m

     

       110
       110
       -
                 ${config.services.mingetty.helpLine}

     

       113
       113
       +
                 [1;32m${config.services.getty.greetingLine}[0m

     

       114
       114
       +
                 ${config.services.getty.helpLine}

     

       111
       115
        
       

     

       112
       116
        
               '';

     

       113
       117
        
             };

+1 -1

nixos/modules/virtualisation/lxc-container.nix

···

       11
       11
        
         users.users.root.initialHashedPassword = mkOverride 150 "";

     

       12
       12
        
       

     

       13
       13
        
         # Some more help text.

     

       14
       14
       -
         services.mingetty.helpLine =

     

       14
       14
       +
         services.getty.helpLine =

     

       15
       15
        
           ''

     

       16
       16
        
       

     

       17
       17
        
             Log in as "root" with an empty password.

+1 -1

nixos/tests/login.nix

···

       50
       50
        
             with subtest("Virtual console logout"):

     

       51
       51
        
                 machine.send_chars("exit\n")

     

       52
       52
        
                 machine.wait_until_fails("pgrep -u alice bash")

     

       53
       53
       -
                 machine.screenshot("mingetty")

     

       53
       53
       +
                 machine.screenshot("getty")

     

       54
       54
        
       

     

       55
       55
        
             with subtest("Check whether ctrl-alt-delete works"):

     

       56
       56
        
                 machine.send_key("ctrl-alt-delete")