Unverified Commit 63e24fbc authored by Will Fancher's avatar Will Fancher Committed by GitHub
Browse files

nixos/display-manager: Disable the dependency on autovt@tty1 rather than masking it (#429845)

parents bec2364e 8cb99658

nixos/modules/services/display-managers/default.nix

+0 −6
Original line number Diff line number Diff line
@@ -267,12 +267,6 @@ in 
      in

      lib.mkIf noDmUsed (lib.mkDefault false);



    # We can't just rely on 'Conflicts=autovt@tty1.service' because

    # 'switch-to-configuration switch' will start 'autovt@tty1.service'

    # and kill us.

    systemd.services."autovt@tty1".enable =

      lib.mkIf config.systemd.services.display-manager.enable false;



    systemd.services.display-manager = {

      description = "Display Manager";

      after = [

nixos/modules/services/ttys/getty.nix

+8 −1
Original line number Diff line number Diff line
@@ -148,7 +148,14 @@ in 
      "container-getty@.service"

    ];



    systemd.targets.getty.wants = [ "autovt@tty1.service" ];

    # We can't just rely on 'Conflicts=autovt@tty1.service' because

    # 'switch-to-configuration switch' will start 'autovt@tty1.service'

    # and kill the display manager.

    systemd.targets.getty.wants =

      lib.mkIf (!(config.systemd.services.display-manager.enable or false))

        [

          "autovt@tty1.service"

        ];



    systemd.services."getty@" = {

      serviceConfig.ExecStart = [