From e481c82fa9521ecc719b29b314543a205c0b53ec Mon Sep 17 00:00:00 2001 From: "Guillaume J. Charmes" Date: Wed, 18 Dec 2013 10:18:49 -0800 Subject: [PATCH] Fix OSX compilation for aufs --- graphdriver/aufs/aufs.go | 3 +-- graphdriver/aufs/mount_darwin.go | 2 ++ graphdriver/aufs/mount_linux.go | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/graphdriver/aufs/aufs.go b/graphdriver/aufs/aufs.go index 558c64c5bb..c3caf13c13 100644 --- a/graphdriver/aufs/aufs.go +++ b/graphdriver/aufs/aufs.go @@ -30,7 +30,6 @@ import ( "os/exec" "path" "strings" - "syscall" ) func init() { @@ -327,7 +326,7 @@ func (a *Driver) aufsMount(ro []string, rw, target string) (err error) { for _, layer := range ro { branch := fmt.Sprintf("append:%s=ro+wh", layer) - if err = mount("none", target, "aufs", syscall.MS_REMOUNT, branch); err != nil { + if err = mount("none", target, "aufs", MsRemount, branch); err != nil { return } } diff --git a/graphdriver/aufs/mount_darwin.go b/graphdriver/aufs/mount_darwin.go index ce448036f2..62c84fc7c9 100644 --- a/graphdriver/aufs/mount_darwin.go +++ b/graphdriver/aufs/mount_darwin.go @@ -2,6 +2,8 @@ package aufs import "errors" +const MsRemount = 0 + func mount(source string, target string, fstype string, flags uintptr, data string) (err error) { return errors.New("mount is not implemented on darwin") } diff --git a/graphdriver/aufs/mount_linux.go b/graphdriver/aufs/mount_linux.go index 8062bae420..c86f1bbd63 100644 --- a/graphdriver/aufs/mount_linux.go +++ b/graphdriver/aufs/mount_linux.go @@ -2,6 +2,8 @@ package aufs import "syscall" +const MsRemount = syscall.MS_REMOUNT + func mount(source string, target string, fstype string, flags uintptr, data string) error { return syscall.Mount(source, target, fstype, flags, data) }