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

Update nix to 0.20.0 #38

Merged
merged 1 commit into from Feb 25, 2021
Merged

Update nix to 0.20.0 #38

merged 1 commit into from Feb 25, 2021

Conversation

Jakob-Naucke
Copy link
Member

to pull in nix-rust/nix#1372 and get statfs MAGIC constants on s390x. Additionally, fork() calls in tests now have to be marked unsafe.

Fixes: #37

Signed-off-by: Jakob Naucke jakob.naucke@ibm.com

to pull in nix-rust/nix#1372 and get statfs
MAGIC constants on s390x. Additionally, fork() calls in tests now have
to be marked unsafe.

Fixes: #37

Signed-off-by: Jakob Naucke <jakob.naucke@ibm.com>
Copy link

@jamesodhunt jamesodhunt left a comment

Choose a reason for hiding this comment

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

Thanks @Jakob-Naucke.

lgtm

@jamesodhunt
Copy link

/cc @lifupan, @liubin.

@lifupan lifupan merged commit 16d73e1 into kata-containers:master Feb 25, 2021
@Jakob-Naucke Jakob-Naucke deleted the update-nix branch February 25, 2021 09:42
@Jakob-Naucke Jakob-Naucke mentioned this pull request Feb 25, 2021
Jakob-Naucke added a commit to Jakob-Naucke/kata-containers that referenced this pull request Mar 29, 2021
to pull in the chain of rust-lang/libc#1999,
nix-rust/nix#1372, and
kata-containers/cgroups-rs#38. This adds statfs
constants on s390x. cgroups-rs 0.2.4 also contains this fix, but let's
move to the latest 0.2.5 right away.

Fixes: kata-containers#1204

Signed-off-by: Jakob Naucke <jakob.naucke@ibm.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CGROUP2_SUPER_MAGIC missing on s390x
4 participants