diff -Nru lxc-1.1.1/debian/changelog lxc-1.1.1/debian/changelog
--- lxc-1.1.1/debian/changelog	2015-03-16 21:10:03.000000000 +0000
+++ lxc-1.1.1/debian/changelog	2015-03-17 19:51:34.000000000 +0000
@@ -1,3 +1,10 @@
+lxc (1.1.1-0ubuntu2) vivid; urgency=medium
+
+  * Cherry-pick fix for attach when stdin isn't a tty:
+    - d3b6301135280d21d0c1c7d427e1c587b3177b69
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Tue, 17 Mar 2015 15:51:09 -0400
+
 lxc (1.1.1-0ubuntu1) vivid; urgency=medium
 
   * New upstream bugfix release (1.1.1)
diff -Nru lxc-1.1.1/debian/.git-dpm lxc-1.1.1/debian/.git-dpm
--- lxc-1.1.1/debian/.git-dpm	2015-03-16 21:09:29.000000000 +0000
+++ lxc-1.1.1/debian/.git-dpm	2015-03-17 19:51:07.000000000 +0000
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-ffd91e2b4ec0cd48fd6a6a193b0cb1c2761a38dd
-ffd91e2b4ec0cd48fd6a6a193b0cb1c2761a38dd
+080af0b708cfb38f33fa60059d8d6d83aa683376
+080af0b708cfb38f33fa60059d8d6d83aa683376
 ffd91e2b4ec0cd48fd6a6a193b0cb1c2761a38dd
 ffd91e2b4ec0cd48fd6a6a193b0cb1c2761a38dd
 lxc_1.1.1.orig.tar.gz
diff -Nru lxc-1.1.1/debian/patches/0001-Skip-control-tty-code-for-non-ttys.patch lxc-1.1.1/debian/patches/0001-Skip-control-tty-code-for-non-ttys.patch
--- lxc-1.1.1/debian/patches/0001-Skip-control-tty-code-for-non-ttys.patch	1970-01-01 00:00:00.000000000 +0000
+++ lxc-1.1.1/debian/patches/0001-Skip-control-tty-code-for-non-ttys.patch	2015-03-17 19:51:07.000000000 +0000
@@ -0,0 +1,27 @@
+From 080af0b708cfb38f33fa60059d8d6d83aa683376 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@ubuntu.com>
+Date: Mon, 16 Mar 2015 21:54:26 -0400
+Subject: Skip control tty code for non-ttys
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
+Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
+---
+ src/lxc/attach.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lxc/attach.c b/src/lxc/attach.c
+index faa90fc..69dafd4 100644
+--- a/src/lxc/attach.c
++++ b/src/lxc/attach.c
+@@ -985,7 +985,7 @@ static int attach_child_main(void* data)
+ 		new_gid = options->gid;
+ 
+ 	/* setup the control tty */
+-	if (options->stdin_fd) {
++	if (options->stdin_fd && isatty(options->stdin_fd)) {
+ 		if (setsid() < 0) {
+ 			SYSERROR("unable to setsid");
+ 			shutdown(ipc_socket, SHUT_RDWR);
diff -Nru lxc-1.1.1/debian/patches/series lxc-1.1.1/debian/patches/series
--- lxc-1.1.1/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ lxc-1.1.1/debian/patches/series	2015-03-17 19:51:07.000000000 +0000
@@ -0,0 +1 @@
+0001-Skip-control-tty-code-for-non-ttys.patch