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.

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/physlock: add suspend-then-hibernate to lockOn.suspend units #74589

Merged
merged 1 commit into from Jun 17, 2020
Merged

nixos/physlock: add suspend-then-hibernate to lockOn.suspend units #74589

merged 1 commit into from Jun 17, 2020

Conversation

tmplt
Copy link
Member

@tmplt tmplt commented Nov 29, 2019

Motivation for this change

I set services.logind.lidSwitch = "suspend-then-hibernate"; which unexpectedly nullified services.physlock.lockOn.suspend = true; I figure since it's a "suspend and then hibernate", we should lock before systemd-suspend-then-hibernate.service too.

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 nix-review --run "nix-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.
Notify maintainers

N/A

@stale
Copy link

stale bot commented Jun 1, 2020

Thank you for your contributions.
This has been automatically marked as stale because it has had no activity for 180 days.
If this is still important to you, we ask that you leave a comment below. Your comment can be as simple as "still important to me". This lets people see that at least one person still cares about this. Someone will have to do this at most twice a year if there is no other activity.
Here are suggestions that might help resolve this more quickly:

  1. Search for maintainers and people that previously touched the
    related code and @ mention them in a comment.
  2. Ask on the NixOS Discourse. 3. Ask on the #nixos channel on
    irc.freenode.net.

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jun 1, 2020
@tmplt tmplt requested a review from infinisil June 12, 2020 14:43
@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jun 12, 2020
@tmplt
Copy link
Member Author

tmplt commented Jun 16, 2020

Until this commit is merged (or in case it wont), one can set services.physlock.lockOn.extraTargets = [ "systemd-suspend-then-hibernate.service" ]; in the meanwhile.

infinisil
infinisil reviewed Jun 16, 2020
View reviewed changes
nixos/modules/services/security/physlock.nix
@@ -105,7 +105,7 @@ in
wantedBy = optional cfg.lockOn.suspend "suspend.target"
++ optional cfg.lockOn.hibernate "hibernate.target"
++ cfg.lockOn.extraTargets;
before = optional cfg.lockOn.suspend "systemd-suspend.service"
before = optionals cfg.lockOn.suspend [ "systemd-suspend.service" "systemd-suspend-then-hibernate.service" ]
++ optional cfg.lockOn.hibernate "systemd-hibernate.service"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it should be added for lockOn.hibernate as well then

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Split it into a new optional (suspend || hibernate).

infinisil
infinisil approved these changes Jun 17, 2020
View reviewed changes
Copy link
Member

@infinisil infinisil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good!

@infinisil infinisil merged commit f03e85f into NixOS:master Jun 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@infinisil infinisil infinisil approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@tmplt @infinisil