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:
Valentin Rothberg
2019-10-02 10:24:06 +02:00
committed by Miloslav Trmač
parent 881edbf122
commit 7922028d7c
323 changed files with 6754 additions and 2326 deletions

View File

@@ -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")
}

View File

@@ -1,4 +1,4 @@
// +build linux,!btrfs_noversion
// +build linux,!btrfs_noversion,cgo
package btrfs

View File

@@ -1,4 +1,4 @@
// +build linux,btrfs_noversion
// +build !linux btrfs_noversion !cgo
package btrfs