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

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

Closed
wants to merge 1 commit into from
Closed

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

wants to merge 1 commit into from

Conversation

jpdoyle
Copy link
Contributor

@jpdoyle jpdoyle commented Aug 29, 2020 •
edited

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.

@ofborg ofborg bot requested review from andir and edolstra August 29, 2020 03:17
@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
Contributor

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
Contributor

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
Reviewers

@flokli flokli Awaiting requested review from flokli

@lheckemann lheckemann Awaiting requested review from lheckemann

@andir andir Awaiting requested review from andir

@edolstra edolstra Awaiting requested review from edolstra

Assignees
No one assigned
Labels
1.severity: channel blocker Blocks a channel 6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

nixos-unstable is blocked because of failing luks-format1 test
4 participants
@jpdoyle @doronbehar @FRidh @flokli