Skip to content

Revert "systemd: build with cryptsetup and cryptsetup-generators"#96575

Closed
jpdoyle wants to merge 1 commit intoNixOS:masterfrom
jpdoyle:fixup_installer_luksroot
Closed

Revert "systemd: build with cryptsetup and cryptsetup-generators"#96575
jpdoyle wants to merge 1 commit intoNixOS:masterfrom
jpdoyle:fixup_installer_luksroot

Conversation

@jpdoyle
Copy link
Contributor

@jpdoyle jpdoyle commented Aug 29, 2020

Fixes #96479 (hopefully)

This reverts commit 72c8ed0.

Motivation for this change

unstable is blocked by #96479

This is a quick hacky fix only -- there is clearly some strange interaction between systemd-udevd and cryptsetup caused by 72c8ed0.

Things done

I'm currently running

$ nix-build -I "nixpkgs=$(pwd)" nixos/tests/installer.nix -A 'luksroot'

However, my machine is taking a while with it as it is rebuilding systemd. I'll update this PR once it completes.

  • 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.

@jpdoyle jpdoyle requested review from flokli and lheckemann August 29, 2020 03:08
@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/` labels Aug 29, 2020
@ofborg ofborg bot requested review from andir and edolstra August 29, 2020 03:17
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Aug 29, 2020
@jpdoyle
Copy link
Contributor Author

jpdoyle commented Aug 29, 2020

$ nix-build -I "nixpkgs=$(pwd)" nixos/tests/installer.nix -A 'luksroot'

^ This succeeded, so I'm willing to say that this revert fixes the issue.

@FRidh FRidh added the 1.severity: channel blocker Blocks a channel label Aug 29, 2020
@doronbehar
Copy link
Contributor

Merge conflicts already?

@FRidh
Copy link
Member

FRidh commented Aug 29, 2020

Reverting is the last resort. In this case, it is likely also problematic (see #96479 (comment)). There was already some fixing up required to get where we are at now.

@flokli
Copy link
Member

flokli commented Aug 29, 2020

Merge conflicts already?

It seems staging-next ended up in master, which included a systemd bump and some refactor of the derivation. However, I'm not very keen on reverting this. There's the whole systemd-cryptsetup-generator derivation, which would need to be brought back as well.

I started some investigation, will comment in the original issue.

@flokli
Copy link
Member

flokli commented Sep 4, 2020

Closing in favor of #97008.

@flokli flokli closed this Sep 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

1.severity: channel blocker Blocks a channel 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: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

nixos-unstable is blocked because of failing luks-format1 test

4 participants