Commit 84da5342 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Pavel Emelyanov

tty: Fixup error message in dump_pty_info()

The sid may be present not only on slave peer
so fix up the message. Also extend it showing
peer type.
Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent f8fa75ae
...@@ -964,9 +964,10 @@ static int dump_pty_info(int lfd, u32 id, const struct fd_parms *p, int major, i ...@@ -964,9 +964,10 @@ static int dump_pty_info(int lfd, u32 id, const struct fd_parms *p, int major, i
struct pstree_item *item = find_first_sid(pti->sid); struct pstree_item *item = find_first_sid(pti->sid);
if (!item || item->pid.virt != pti->sid) { if (!item || item->pid.virt != pti->sid) {
if (!opts.shell_job) { if (!opts.shell_job) {
pr_err("Found sid %d pgid %d on slave peer fd %d. " pr_err("Found sid %d pgid %d (%s) on peer fd %d. "
"Missing option?\n", "Missing option?\n",
pti->sid, pti->pgrp, p->fd); pti->sid, pti->pgrp,
tty_type(major), p->fd);
return -1; return -1;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment