From 5e3db1b298cfa1939e4748174e60d5623ea19337 Mon Sep 17 00:00:00 2001 From: Morris Jette <jette@schedmd.com> Date: Tue, 13 Mar 2012 15:12:30 -0700 Subject: [PATCH] Treat no controlling terminal on cray as warning --- src/salloc/salloc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/salloc/salloc.c b/src/salloc/salloc.c index c4191e5c362..43031739567 100644 --- a/src/salloc/salloc.c +++ b/src/salloc/salloc.c @@ -249,10 +249,14 @@ int main(int argc, char *argv[]) * after first making sure stdin is not redirected. */ } else if ((tpgid = tcgetpgrp(STDIN_FILENO)) < 0) { +#ifdef HAVE_CRAY + verbose("no controlling terminal"); +#else if (!opt.no_shell) { error("no controlling terminal: please set --no-shell"); exit(error_exit); } +#endif #ifdef SALLOC_RUN_FOREGROUND } else if ((!opt.no_shell) && (pid == getpgrp())) { if (tpgid == pid) -- GitLab