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

[12.0 stable] Allow device access when loading OCI spec from file #3950

Merged
merged 1 commit into from
May 29, 2024

Conversation

europaul
Copy link
Contributor

@europaul europaul commented May 28, 2024

Since the update to runc v1.1.0 and containerd v1.6.1 in 158cecd we need to explicitly allow device access in the OCI config. This is done when generating a new OCI spec.
However, when loading an OCI config from a file, we need to make sure that the device access is added, because older OCI configs may lack this configuration.

(cherry picked from commit 17d9a41)

@eriknordmark
Copy link
Contributor

Can we do these backport PRs/commits so that the commit and PR messages reference to the commit in master? See for instance the commits in #3943)
(FWIW I do that automatically by using git cherry-pick)

Since the update to runc v1.1.0 and containerd v1.6.1 in
158cecd we need to explicitly allow
device access in the OCI config. This is done when generating a new OCI
spec.
However, when loading an OCI config from a file, we need to make sure
that the device access is added, because older OCI configs may lack
this configuration.

Signed-off-by: Paul Gaiduk <paulg@zededa.com>
(cherry picked from commit 17d9a41)
@europaul
Copy link
Contributor Author

Can we do these backport PRs/commits so that the commit and PR messages reference to the commit in master? See for instance the commits in #3943) (FWIW I do that automatically by using git cherry-pick)

That absolutely makes sense! I re-ran cherry-pick with -x to add this info (because the option is disabled by default). Also it only adds this info for commits that had no merge conflicts which I think makes sense.

Copy link
Contributor

@eriknordmark eriknordmark left a comment

Choose a reason for hiding this comment

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

LGTM

@eriknordmark eriknordmark merged commit 8b475cf into lf-edge:12.0 May 29, 2024
27 of 34 checks passed
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.

3 participants