Merge lp:~serge-hallyn/ubuntu/precise/util-linux/fix-getty-on-pts into lp:ubuntu/precise/util-linux

[Serge Hallyn]

patch term-utils/agetty.c: allow getty to work on /dev/pts/N

This takes upstream commit 1593b134ebf596ae7a2b1e73f2dcc8c4e7febddd,
plus an extra s/log_err/log_warn/ if when tcsetpgrp fails.

This is needed for libvirt-lxc and lxc consoles to work.

[Colin Watson (cjwatson)]

Looks good to me, thanks.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-16 22:53:42 +0000
+++ debian/changelog	2012-01-12 23:06:03 +0000
@@ -1,3 +1,14 @@
+util-linux (2.20.1-1ubuntu2) precise; urgency=low
+
+  * term-utils/agetty.c: allow getty to work on /dev/pts/N
+      
+    This takes upstream commit 1593b134ebf596ae7a2b1e73f2dcc8c4e7febddd,
+    plus an extra s/log_err/log_warn/ if when tcsetpgrp fails.
+
+    This is needed for libvirt-lxc and lxc consoles to work.
+
+ -- Serge Hallyn <[e-mail]>  Thu, 12 Jan 2012 13:54:09 +0100
+
 util-linux (2.20.1-1ubuntu1) precise; urgency=low
 
   * Merge from Debian unstable, remaining changes:
 
=== modified file 'term-utils/agetty.c'
--- term-utils/agetty.c	2011-11-03 15:38:23 +0000
+++ term-utils/agetty.c	2012-01-12 23:06:03 +0000
@@ -908,7 +908,7 @@
 
 		if (((tid = tcgetsid(fd)) < 0) || (pid != tid)) {
 			if (ioctl(fd, TIOCSCTTY, 1) == -1)
-				log_err("/dev/%s: cannot get controlling tty: %m", tty);
+				log_warn("/dev/%s: cannot get controlling tty: %m", tty);
 		}
 
 		if (op->flags & F_HANGUP) {
@@ -933,7 +933,7 @@
 			log_err(_("/dev/%s: cannot open as standard input: %m"), tty);
 		if (((tid = tcgetsid(STDIN_FILENO)) < 0) || (pid != tid)) {
 			if (ioctl(STDIN_FILENO, TIOCSCTTY, 1) == -1)
-				log_err("/dev/%s: cannot get controlling tty: %m", tty);
+				log_warn("/dev/%s: cannot get controlling tty: %m", tty);
 		}
 
 	} else {
@@ -949,7 +949,7 @@
 	}
 
 	if (tcsetpgrp(STDIN_FILENO, pid))
-		log_err("/dev/%s: cannot set process group: %m", tty);
+		log_warn("/dev/%s: cannot set process group: %m", tty);
 
 	/* Get rid of the present outputs. */
 	close(STDOUT_FILENO);