Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 56bb1b0f7a33
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 88738dd72d05
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Dec 12, 2020

  1. nixos/console: fix Before= on the systemd-vconsole-setup unit 

    Only set Before=display-manager.service if it is actually present.

On headless systems, `systemctl list-units --state not-found` will
otherwise show display-manager.service.

Reported-In: #88597
    @flokli
    flokli committed Dec 12, 2020
    Copy the full SHA
    536988b View commit details

Commits on Jan 2, 2021

  1. Merge pull request #106787 from flokli/console-optional-display-manager 

    nixos/console: fix Before= on the systemd-vconsole-setup unit
    @flokli
    flokli authored Jan 2, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    88738dd View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 nixos/modules/config/console.nix
3 changes: 2 additions & 1 deletion nixos/modules/config/console.nix
View file
Original file line number Diff line number Diff line change
@@ -145,7 +145,8 @@ in
'';

systemd.services.systemd-vconsole-setup =
{ before = [ "display-manager.service" ];
{
before = optional config.services.xserver.enable "display-manager.service";
after = [ "systemd-udev-settle.service" ];
restartTriggers = [ vconsoleConf consoleEnv ];
};