opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-29 17:06:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

update c/storage to latest

Browse Source 
Signed-off-by: Doug Rabson <dfr@rabson.org>
This commit is contained in:
Doug Rabson
2022-09-12 08:11:41 +01:00
parent 1635fe8620
commit d935e97994
6 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
vendor/github.com/containers/storage/layers.go generated vendored
View File

@ -344,6 +344,14 @@ func (r *layerStore) layerspath() string {
func (r *layerStore) Load() error {
shouldSave := false
rpath := r.layerspath()
info, err := os.Stat(rpath)
if err != nil {
if !os.IsNotExist(err) {
return err
}
} else {
r.layerspathModified = info.ModTime()
}
data, err := ioutil.ReadFile(rpath)
if err != nil && !os.IsNotExist(err) {
return err
@ -423,15 +431,6 @@ func (r *layerStore) Load() error {
}
}
info, statErr := os.Stat(r.layerspath())
if statErr != nil && !os.IsNotExist(statErr) {
return statErr
}
if info != nil {
r.layerspathModified = info.ModTime()
}
return err
}

1
vendor/github.com/containers/storage/pkg/system/meminfo_freebsd.go generated vendored
View File

@ -4,6 +4,7 @@
package system
import (
"errors"
"fmt"
"unsafe"

4
vendor/github.com/containers/storage/pkg/unshare/unshare_linux.go generated vendored
View File

@ -394,7 +394,9 @@ func hasFullUsersMappings() (bool, error) {
if err != nil {
return false, err
}
// if the uid_map contains 4294967295, the entire IDs space is available in the
// The kernel rejects attempts to create mappings where either starting
// point is (u32)-1: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/kernel/user_namespace.c?id=af3e9579ecfb#n1006 .
// So, if the uid_map contains 4294967295, the entire IDs space is available in the
// user namespace, so it is likely the initial user namespace.
return bytes.Contains(content, []byte("4294967295")), nil
}