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

nixos stage-1: wait for resume devices to appear #17100

Merged
merged 3 commits into from
Aug 8, 2016

Conversation

abbradar
Copy link
Member

Motivation for this change

Fixes #8803

Things done
  • Tested using sandboxing
    (nix.useChroot on NixOS,
    or option build-use-chroot in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • OS X
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Tested with tests.hibernate.x86_64-linux. This needs further testing: I can't test this in situations where the delay is actually needed.

@mention-bot
Copy link

@abbradar, thanks for your PR! By analyzing the annotation information on this pull request, we identified @edolstra, @7c6f434c and @wmertens to be potential reviewers

@wmertens
Copy link
Contributor

Could you make this commit be minimal? Looks like you moved some functions around so it's hard to tell what changed. If you really want to move those, do it in a separate "cleanup" commit.

@abbradar
Copy link
Member Author

abbradar commented Aug 7, 2016

@wmertens Done, thanks for the remark!

@wmertens
Copy link
Contributor

wmertens commented Aug 8, 2016

Alright, looks fine to me. Should not impact builds and should not break working things, so merging.

@wmertens wmertens merged commit db8401f into NixOS:master Aug 8, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants