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

Revert "nixos/switch-to-configuration: Never stop system.slice" #60332

Merged
merged 1 commit into from
Apr 28, 2019
Merged

Revert "nixos/switch-to-configuration: Never stop system.slice" #60332

merged 1 commit into from
Apr 28, 2019
+0 −18

Conversation

primeos
Copy link
Member

@primeos primeos commented Apr 27, 2019

This change was only a temporary workaround and isn't required anymore,
since /etc/systemd/system/system.slice should not be present on any
recent NixOS system (which makes this change a no-op).

This reverts commit 7098b0f.

Motivation for this change
Things done

Tested it on my NixOS system - not extensively but the change is so trivial that it shouldn't cause any problems (apart from very old systems that still have /etc/systemd/system/system.slice).

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@primeos
Revert "nixos/switch-to-configuration: Never stop system.slice"

Verified

This commit was signed with the committer’s verified signature.
pradyunsg Pradyun Gedam
GPG key ID: FF99710C4332258E
Verified
Learn about vigilant mode
066ca28 
This change was only a temporary workaround and isn't required anymore,
since /etc/systemd/system/system.slice should not be present on any
recent NixOS system (which makes this change a no-op).

This reverts commit 7098b0f.
@primeos primeos requested a review from infinisil as a code owner April 27, 2019 16:36
@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 Apr 27, 2019
@FRidh FRidh added this to the 19.09 milestone Apr 28, 2019
@FRidh FRidh merged commit 698388b into NixOS:master Apr 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@infinisil infinisil

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: clean-up 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
19.09
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@primeos @FRidh