Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nixos/console: fix Before= on the systemd-vconsole-setup unit #106787

Merged
merged 1 commit into from
Jan 2, 2021
Merged

nixos/console: fix Before= on the systemd-vconsole-setup unit #106787

merged 1 commit into from
Jan 2, 2021

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Dec 12, 2020 •
edited
Loading

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

Manually ran a VM with some headless system via the test driver and verified it doesn't show up later anymore.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@flokli
nixos/console: fix Before= on the systemd-vconsole-setup unit
536988b 
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: NixOS#88597
@flokli flokli mentioned this pull request Dec 12, 2020
Open
19 tasks
@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Dec 12, 2020
@flokli flokli merged commit 88738dd into NixOS:master Jan 2, 2021
@flokli flokli deleted the console-optional-display-manager branch January 2, 2021 10:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@flokli