mirror of
https://github.com/containers/podman.git
synced 2025-12-12 09:50:25 +08:00
Vendor in containers/(storage,image, common, buildah)
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
4
vendor/github.com/containers/storage/pkg/mount/flags.go
generated
vendored
4
vendor/github.com/containers/storage/pkg/mount/flags.go
generated
vendored
@@ -99,7 +99,7 @@ func MergeTmpfsOptions(options []string) ([]string, error) {
|
||||
}
|
||||
opt := strings.SplitN(option, "=", 2)
|
||||
if len(opt) != 2 || !validFlags[opt[0]] {
|
||||
return nil, fmt.Errorf("Invalid tmpfs option %q", opt)
|
||||
return nil, fmt.Errorf("invalid tmpfs option %q", opt)
|
||||
}
|
||||
if !dataCollisions[opt[0]] {
|
||||
// We prepend the option and add to collision map
|
||||
@@ -142,7 +142,7 @@ func ParseTmpfsOptions(options string) (int, string, error) {
|
||||
for _, o := range strings.Split(data, ",") {
|
||||
opt := strings.SplitN(o, "=", 2)
|
||||
if !validFlags[opt[0]] {
|
||||
return 0, "", fmt.Errorf("Invalid tmpfs option %q", opt)
|
||||
return 0, "", fmt.Errorf("invalid tmpfs option %q", opt)
|
||||
}
|
||||
}
|
||||
return flags, data, nil
|
||||
|
||||
2
vendor/github.com/containers/storage/pkg/mount/mounter_freebsd.go
generated
vendored
2
vendor/github.com/containers/storage/pkg/mount/mounter_freebsd.go
generated
vendored
@@ -62,7 +62,7 @@ func mount(device, target, mType string, flag uintptr, data string) error {
|
||||
|
||||
if errno := C.nmount(&rawOptions[0], C.uint(len(options)), C.int(flag)); errno != 0 {
|
||||
reason := C.GoString(C.strerror(*C.__error()))
|
||||
return fmt.Errorf("Failed to call nmount: %s", reason)
|
||||
return fmt.Errorf("failed to call nmount: %s", reason)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user