Skip to content

nixos/tasks/lvm: fix systemd tmpfiles#93838

Merged
vcunat merged 1 commit intoNixOS:masterfrom
helsinki-systems:fix/lvm2-tmpfiles
Jul 25, 2020
Merged

nixos/tasks/lvm: fix systemd tmpfiles#93838
vcunat merged 1 commit intoNixOS:masterfrom
helsinki-systems:fix/lvm2-tmpfiles

Conversation

@ajs124
Copy link
Member

@ajs124 ajs124 commented Jul 25, 2020 •
edited
Loading

Motivation for this change

@flokli @dasJ and I might have made a small mistake when working on #93073 and #93024 which have lead to half the builds in nixos:unstable-small to fail.

Sorry for that. This should fix that.

cc @vcunat

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.

@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 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jul 25, 2020
chvp
chvp approved these changes Jul 25, 2020
View reviewed changes
Copy link
Member

@chvp chvp left a comment

Choose a reason for hiding this comment

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

I applied the same fix to make my system build, now running with no problems.

@vcunat
Copy link
Member

vcunat commented Jul 25, 2020

It appears good, but nixos.tests.installer.lvm.x86_64-linux still won't build for me.

@vcunat
Copy link
Member

vcunat commented Jul 25, 2020 •
edited
Loading

OK, that seems not really related. We got over a size hard-coded in that test.

@vcunat vcunat merged commit 499ae67 into NixOS:master Jul 25, 2020
@ajs124 ajs124 deleted the fix/lvm2-tmpfiles branch July 25, 2020 22:06
@vcunat vcunat mentioned this pull request Jul 26, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dasJ dasJ dasJ approved these changes

+1 more reviewer

@chvp chvp chvp approved these changes

Reviewers whose approvals may not affect merge requirements

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 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@ajs124 @vcunat @dasJ @chvp