From 2dcfba71170ad91538a7dbb4dd97ec0c1d2f9788 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Fri, 4 May 2001 22:13:37 +0000 Subject: [PATCH] Larry's variant on Evin Robertson's fix to what I messed up trying to make job control work. This fix makes it so that hush doesn't error out when init hasn't set up job control, as in when init=/bin/sh --- hush.c | 2 +- shell/hush.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hush.c b/hush.c index 976fa3805..b8e4a55c2 100644 --- a/hush.c +++ b/hush.c @@ -1185,7 +1185,7 @@ static int run_pipe_real(struct pipe *pi) pi->pgrp = 0; /* Check if we are supposed to run in the foreground */ - if (pi->followup!=PIPE_BG) { + if (interactive && pi->followup!=PIPE_BG) { if ((pi->pgrp = tcgetpgrp(ctty = 2)) < 0 && (pi->pgrp = tcgetpgrp(ctty = 0)) < 0 && (pi->pgrp = tcgetpgrp(ctty = 1)) < 0) diff --git a/shell/hush.c b/shell/hush.c index 976fa3805..b8e4a55c2 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -1185,7 +1185,7 @@ static int run_pipe_real(struct pipe *pi) pi->pgrp = 0; /* Check if we are supposed to run in the foreground */ - if (pi->followup!=PIPE_BG) { + if (interactive && pi->followup!=PIPE_BG) { if ((pi->pgrp = tcgetpgrp(ctty = 2)) < 0 && (pi->pgrp = tcgetpgrp(ctty = 0)) < 0 && (pi->pgrp = tcgetpgrp(ctty = 1)) < 0)