summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysinstall
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2002-04-07 10:08:55 +0000
committerobrien <obrien@FreeBSD.org>2002-04-07 10:08:55 +0000
commitef34de0ca4ec054f667bd3a4cc93d59af0fb3723 (patch)
treed2501a5b7cfd0abeafe5e5c9989a69eefd3533b5 /usr.sbin/sysinstall
parentf502b9b788d9f6864e4734e1de19f93b916b478e (diff)
downloadFreeBSD-src-ef34de0ca4ec054f667bd3a4cc93d59af0fb3723.zip
FreeBSD-src-ef34de0ca4ec054f667bd3a4cc93d59af0fb3723.tar.gz
Remove some last vestages of _interactiveHack.
Also tie stderr to something for the invocation of pkg_add. Sponsored by: FreeBSD Mall, Inc.
Diffstat (limited to 'usr.sbin/sysinstall')
-rw-r--r--usr.sbin/sysinstall/package.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/usr.sbin/sysinstall/package.c b/usr.sbin/sysinstall/package.c
index f1a3b87..b067f63 100644
--- a/usr.sbin/sysinstall/package.c
+++ b/usr.sbin/sysinstall/package.c
@@ -167,13 +167,8 @@ package_extract(Device *dev, char *name, Boolean depended)
pipe(pfd);
pid = fork();
if (!pid) {
- extern int _interactiveHack;
-
dup2(pfd[0], 0); close(pfd[0]);
- if (!_interactiveHack) {
- dup2(DebugFD, 1);
- close(2);
- }
+ dup2(DebugFD, 1); dup2(1, 2);
close(pfd[1]);
/* Prevent pkg_add from wanting to interact in bad ways */
OpenPOWER on IntegriCloud