Unverified Commit d05074f9 authored by Michele Guerini Rocco's avatar Michele Guerini Rocco Committed by GitHub
Browse files

nixos/getty: only include if `config.console.enable == true` (#363533)

parents d2ab2691 7fb2f407

nixos/modules/config/console.nix

+4 −10
Original line number Diff line number Diff line
@@ -128,16 +128,6 @@ in 
          '');

    }



    (lib.mkIf (!cfg.enable) {

      systemd.services = {

        "serial-getty@ttyS0".enable = false;

        "serial-getty@hvc0".enable = false;

        "getty@tty1".enable = false;

        "autovt@".enable = false;

        systemd-vconsole-setup.enable = false;

      };

    })



    (lib.mkIf cfg.enable (lib.mkMerge [

      { environment.systemPackages = [ pkgs.kbd ];
@@ -178,6 +168,10 @@ in 
          "${cfg.keyMap}"

        ];



        systemd.additionalUpstreamSystemUnits = [

          "systemd-vconsole-setup.service"

        ];



        systemd.services.reload-systemd-vconsole-setup =

          { description = "Reset console on configuration changes";

            wantedBy = [ "multi-user.target" ];

nixos/modules/services/ttys/getty.nix

+10 −1
Original line number Diff line number Diff line
@@ -120,12 +120,21 @@ in 


  ###### implementation



  config = {

  config = mkIf config.console.enable {

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

    # nixos.label would not rebuild manual pages

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

    services.getty.helpLine = mkIf (config.documentation.nixos.enable && config.documentation.doc.enable) "\nRun 'nixos-help' for the NixOS manual.";



    systemd.additionalUpstreamSystemUnits = [

      "getty.target"

      "getty-pre.target"

      "getty@.service"

      "serial-getty@.service"

      "console-getty.service"

      "container-getty@.service"

    ];



    systemd.services."getty@" =

      { serviceConfig.ExecStart = [

          # override upstream default with an empty ExecStart

nixos/modules/system/boot/systemd.nix

+0 −9
Original line number Diff line number Diff line
@@ -60,15 +60,6 @@ let 
      # hwdb.bin is managed by NixOS

      # "systemd-hwdb-update.service"



      # Consoles.

      "getty.target"

      "getty-pre.target"

      "getty@.service"

      "serial-getty@.service"

      "console-getty.service"

      "container-getty@.service"

      "systemd-vconsole-setup.service"



      # Hardware (started by udev when a relevant device is plugged in).

      "sound.target"

      "bluetooth.target"