From 0922b8dd1664e4f2422ca49962825a17b5547aa1 Mon Sep 17 00:00:00 2001
From: shin- <joffrey@dotcloud.com>
Date: Mon, 28 Jan 2013 17:06:46 -0800
Subject: [PATCH 1/2] Different termios for linux/darwin Upstream-commit:
 08ac1d0b3543b9ab98b2cbeaea6bb9512d6a14b5 Component: engine

---
 components/engine/docker/docker.go         | 4 ----
 components/engine/docker/termios_darwin.go | 6 ++++++
 components/engine/docker/termios_linux.go  | 8 ++++++++
 3 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 components/engine/docker/termios_darwin.go
 create mode 100644 components/engine/docker/termios_linux.go

diff --git a/components/engine/docker/docker.go b/components/engine/docker/docker.go
index 1c3c5a366b..2e73009870 100644
--- a/components/engine/docker/docker.go
+++ b/components/engine/docker/docker.go
@@ -21,10 +21,6 @@ type Termios struct {
 	Ospeed uintptr
 }
 
-const (
-	getTermios = syscall.TIOCGETA
-	setTermios = syscall.TIOCSETA
-)
 
 const (
 	// Input flags
diff --git a/components/engine/docker/termios_darwin.go b/components/engine/docker/termios_darwin.go
new file mode 100644
index 0000000000..fc920d4860
--- /dev/null
+++ b/components/engine/docker/termios_darwin.go
@@ -0,0 +1,6 @@
+package main
+
+const (
+	getTermios = syscall.TCIOGETA
+	setTermios = syscall.TCIOSETA
+)
diff --git a/components/engine/docker/termios_linux.go b/components/engine/docker/termios_linux.go
new file mode 100644
index 0000000000..882dee1276
--- /dev/null
+++ b/components/engine/docker/termios_linux.go
@@ -0,0 +1,8 @@
+package main
+
+import "syscall"
+
+const (
+	getTermios = syscall.TCGETS
+	setTermios = syscall.TCSETS
+)

From e0d4eb73611f5d138da5b39dd2346b8c1194bc7f Mon Sep 17 00:00:00 2001
From: shin- <joffrey@dotcloud.com>
Date: Mon, 28 Jan 2013 17:07:38 -0800
Subject: [PATCH 2/2] Forgot an import in termios_darwin Upstream-commit:
 c914aaf43e9eea2e67f42fc93667a40c36b6cd35 Component: engine

---
 components/engine/docker/termios_darwin.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/engine/docker/termios_darwin.go b/components/engine/docker/termios_darwin.go
index fc920d4860..e731555562 100644
--- a/components/engine/docker/termios_darwin.go
+++ b/components/engine/docker/termios_darwin.go
@@ -1,5 +1,7 @@
 package main
 
+import "syscall"
+
 const (
 	getTermios = syscall.TCIOGETA
 	setTermios = syscall.TCIOSETA