github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-08-12 03:42:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1968 from mtrmac/NewPid2

Browse Source 
Avoid use of a deprecated capability.NewPid
This commit is contained in:
Miloslav Trmač 2023-04-06 18:24:32 +02:00 committed by GitHub
commit 9ffdceb157
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/skopeo/unshare_linux.go
View File

@ -22,10 +22,13 @@ func maybeReexec() error {
// With Skopeo we need only the subset of the root capabilities necessary // With Skopeo we need only the subset of the root capabilities necessary
// for pulling an image to the storage. Do not attempt to create a namespace // for pulling an image to the storage. Do not attempt to create a namespace
// if we already have the capabilities we need. // if we already have the capabilities we need.
capabilities, err := capability.NewPid(0) capabilities, err := capability.NewPid2(0)
if err != nil { if err != nil {
return fmt.Errorf("error reading the current capabilities sets: %w", err) return fmt.Errorf("error reading the current capabilities sets: %w", err)
} }
if err := capabilities.Load(); err != nil {
return fmt.Errorf("error loading the current capabilities sets: %w", err)
}
if slices.ContainsFunc(neededCapabilities, func(cap capability.Cap) bool { if slices.ContainsFunc(neededCapabilities, func(cap capability.Cap) bool {
return !capabilities.Get(capability.EFFECTIVE, cap) return !capabilities.Get(capability.EFFECTIVE, cap)
}) { }) {