mirror of
https://github.com/containers/skopeo.git
synced 2025-09-25 12:16:17 +00:00
Update to c/image v4.0.1
Update to use the correct c/image/v4 import path, work originally from https://github.com/containers/skopeo/pull/733 by Valentin Rothberg <rothberg@redhat.com>. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
committed by
Miloslav Trmač
parent
881edbf122
commit
7922028d7c
12
vendor/github.com/containers/storage/drivers/btrfs/btrfs.go
generated
vendored
12
vendor/github.com/containers/storage/drivers/btrfs/btrfs.go
generated
vendored
@@ -1,4 +1,4 @@
|
||||
// +build linux
|
||||
// +build linux,cgo
|
||||
|
||||
package btrfs
|
||||
|
||||
@@ -645,7 +645,15 @@ func (d *Driver) Get(id string, options graphdriver.MountOpts) (string, error) {
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
if len(options.Options) > 0 {
|
||||
switch len(options.Options) {
|
||||
case 0:
|
||||
case 1:
|
||||
if options.Options[0] == "ro" {
|
||||
// ignore "ro" option
|
||||
break
|
||||
}
|
||||
fallthrough
|
||||
default:
|
||||
return "", fmt.Errorf("btrfs driver does not support mount options")
|
||||
}
|
||||
|
||||
|
2
vendor/github.com/containers/storage/drivers/btrfs/version.go
generated
vendored
2
vendor/github.com/containers/storage/drivers/btrfs/version.go
generated
vendored
@@ -1,4 +1,4 @@
|
||||
// +build linux,!btrfs_noversion
|
||||
// +build linux,!btrfs_noversion,cgo
|
||||
|
||||
package btrfs
|
||||
|
||||
|
2
vendor/github.com/containers/storage/drivers/btrfs/version_none.go
generated
vendored
2
vendor/github.com/containers/storage/drivers/btrfs/version_none.go
generated
vendored
@@ -1,4 +1,4 @@
|
||||
// +build linux,btrfs_noversion
|
||||
// +build !linux btrfs_noversion !cgo
|
||||
|
||||
package btrfs
|
||||
|
||||
|
Reference in New Issue
Block a user