[src/netbsd-7]: src/usr.sbin/sysinst Pull up following revision(s) (requested...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0c8f25339484
branches:  netbsd-7
changeset: 798761:0c8f25339484
user:      snj <snj%NetBSD.org@localhost>
date:      Wed Dec 31 06:23:11 2014 +0000

description:
Pull up following revision(s) (requested by martin in ticket #361):
        usr.sbin/sysinst/run.c: revisions 1.4, 1.5
If we launch a program with RUN_SILENT, give it more than two seconds to
run before we create an output window. On a swapping VAX it can take
seriously longer, and we get interactive status display even if the program
did not produce any error output otherwise.
--
Revise previous: with RUN_SILENT there is never a good reason to create
the output window unless there is actually output to display.

diffstat:

 usr.sbin/sysinst/run.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (22 lines):

diff -r b423610d0282 -r 0c8f25339484 usr.sbin/sysinst/run.c
--- a/usr.sbin/sysinst/run.c    Wed Dec 31 06:19:19 2014 +0000
+++ b/usr.sbin/sysinst/run.c    Wed Dec 31 06:23:11 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: run.c,v 1.2 2014/08/03 16:09:38 martin Exp $   */
+/*     $NetBSD: run.c,v 1.2.4.1 2014/12/31 06:23:11 snj Exp $  */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -497,10 +497,10 @@
                        errx(1, mmsg);
                }
                read_fd_set = active_fd_set;
-               tmo.tv_sec = 2;
+               tmo.tv_sec = flags & RUN_SILENT ? 20 : 2;
                tmo.tv_usec = 0;
                i = select(FD_SETSIZE, &read_fd_set, NULL, NULL, &tmo);
-               if (i == 0 && *actionwin == NULL)
+               if (i == 0 && *actionwin == NULL && (flags & RUN_SILENT) == 0)
                        *actionwin = show_cmd(scmd, win);
                if (i < 0) {
                        if (errno != EINTR) {