Merge pull request #3264 from creack/fix_osx_compilation

Fix osx compilation
Upstream-commit: 553b4dae453fccf3dee1e36099cc5bb67129f69f
Component: engine

components/engine/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
 			}
 		}

components/engine/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")
 }

components/engine/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)
 }

components/engine/sysinit/sysinit.go

@@ -32,7 +32,7 @@ func setupHostname(args *DockerInitArgs) error {
 	if hostname == "" {
 		return nil
 	}
-	return syscall.Sethostname([]byte(hostname))
+	return setHostname(hostname)
 }
 
 // Setup networking

components/engine/sysinit/sysinit_darwin.go

@@ -0,0 +1,5 @@
+package sysinit
+
+func setHostname(hostname string) error {
+	panic("Not supported on darwin")
+}

components/engine/sysinit/sysinit_linux.go

@@ -0,0 +1,9 @@
+package sysinit
+
+import (
+	"syscall"
+)
+
+func setHostname(hostname string) error {
+	return syscall.Sethostname([]byte(hostname))
+}