Ubuntu
util-linux package

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

  1. Precise (12.04)
  2. fix-getty-on-pts
  3. Merge into precise
Proposed by Serge Hallyn
Status: Merged
Merged at revision: 86
Proposed branch: lp:~serge-hallyn/ubuntu/precise/util-linux/fix-getty-on-pts
Merge into: lp:ubuntu/precise/util-linux
Diff against target: 49 lines (+14/-3)
2 files modified
debian/changelog (+11/-0)
term-utils/agetty.c (+3/-3)
To merge this branch: bzr merge lp:~serge-hallyn/ubuntu/precise/util-linux/fix-getty-on-pts
Reviewer Review Type Date Requested Status
Colin Watson Approve
Review via email: mp+88438@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

Looks good to me, thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-12-16 22:53:42 +0000
3+++ debian/changelog 2012-01-12 23:06:03 +0000
4@@ -1,3 +1,14 @@
5+util-linux (2.20.1-1ubuntu2) precise; urgency=low
6+
7+ * term-utils/agetty.c: allow getty to work on /dev/pts/N
8+
9+ This takes upstream commit 1593b134ebf596ae7a2b1e73f2dcc8c4e7febddd,
10+ plus an extra s/log_err/log_warn/ if when tcsetpgrp fails.
11+
12+ This is needed for libvirt-lxc and lxc consoles to work.
13+
14+ -- Serge Hallyn <serge.hallyn@ubuntu.com> Thu, 12 Jan 2012 13:54:09 +0100
15+
16 util-linux (2.20.1-1ubuntu1) precise; urgency=low
17
18 * Merge from Debian unstable, remaining changes:
19
20=== modified file 'term-utils/agetty.c'
21--- term-utils/agetty.c 2011-11-03 15:38:23 +0000
22+++ term-utils/agetty.c 2012-01-12 23:06:03 +0000
23@@ -908,7 +908,7 @@
24
25 if (((tid = tcgetsid(fd)) < 0) || (pid != tid)) {
26 if (ioctl(fd, TIOCSCTTY, 1) == -1)
27- log_err("/dev/%s: cannot get controlling tty: %m", tty);
28+ log_warn("/dev/%s: cannot get controlling tty: %m", tty);
29 }
30
31 if (op->flags & F_HANGUP) {
32@@ -933,7 +933,7 @@
33 log_err(_("/dev/%s: cannot open as standard input: %m"), tty);
34 if (((tid = tcgetsid(STDIN_FILENO)) < 0) || (pid != tid)) {
35 if (ioctl(STDIN_FILENO, TIOCSCTTY, 1) == -1)
36- log_err("/dev/%s: cannot get controlling tty: %m", tty);
37+ log_warn("/dev/%s: cannot get controlling tty: %m", tty);
38 }
39
40 } else {
41@@ -949,7 +949,7 @@
42 }
43
44 if (tcsetpgrp(STDIN_FILENO, pid))
45- log_err("/dev/%s: cannot set process group: %m", tty);
46+ log_warn("/dev/%s: cannot set process group: %m", tty);
47
48 /* Get rid of the present outputs. */
49 close(STDOUT_FILENO);

Subscribers

People subscribed via source and target branches

to all changes: