summaryrefslogtreecommitdiff
path: root/release/sysinstall
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>2000-03-12 03:57:26 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>2000-03-12 03:57:26 +0000
commitc87413f73b1e676e9a5df0e9f8752a8034c408d9 (patch)
treee166ea99b56430f964e52889889504981c1ee5d2 /release/sysinstall
parent4951dddb33086f59a5db4483c07d988ced2e48b5 (diff)
Notes
Diffstat (limited to 'release/sysinstall')
-rw-r--r--release/sysinstall/globals.c2
-rw-r--r--release/sysinstall/install.c2
-rw-r--r--release/sysinstall/package.c3
-rw-r--r--release/sysinstall/sysinstall.h1
4 files changed, 1 insertions, 7 deletions
diff --git a/release/sysinstall/globals.c b/release/sysinstall/globals.c
index 31eb3a749c5b..2dccef2ab6fc 100644
--- a/release/sysinstall/globals.c
+++ b/release/sysinstall/globals.c
@@ -47,7 +47,6 @@ Boolean RunningAsInit; /* Are we running as init? */
Boolean DialogActive; /* Is libdialog initialized? */
Boolean ColorDisplay; /* Are we on a color display? */
Boolean OnVTY; /* Are we on a VTY? */
-Boolean PkgInteractive; /* Is the package going to spew at us? */
Boolean USAResident; /* Are we cryptographically challenged? */
Variable *VarHead; /* The head of the variable chain */
Device *mediaDevice; /* Where we're installing from */
@@ -64,7 +63,6 @@ globalsInit(void)
{
DebugFD = -1;
ColorDisplay = FALSE;
- PkgInteractive = FALSE;
Fake = FALSE;
OnVTY = FALSE;
DialogActive = FALSE;
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index 29a4ca4fd8c7..6e1294530f5d 100644
--- a/release/sysinstall/install.c
+++ b/release/sysinstall/install.c
@@ -571,14 +571,12 @@ nodisks:
"response to the CRYPTO distribution dialog. Do you want to try and\n"
"load the rsaref package from the current media? Some restrictions on\n"
"usage may apply, so be sure to read the package installation output!")) {
- PkgInteractive = TRUE;
dialog_clear();
if (DITEM_STATUS(package_add("rsaref")) != DITEM_SUCCESS) {
msgConfirm("Unable to find an rsaref package on the current intallation media.\n"
"You may wish to switch media types and try again, perhaps\n"
"from an FTP server which carries this package.");
}
- PkgInteractive = FALSE;
dialog_clear();
}
}
diff --git a/release/sysinstall/package.c b/release/sysinstall/package.c
index 1959df74a4cf..8901d08b998a 100644
--- a/release/sysinstall/package.c
+++ b/release/sysinstall/package.c
@@ -167,8 +167,7 @@ package_extract(Device *dev, char *name, Boolean depended)
pid = fork();
if (!pid) {
dup2(pfd[0], 0); close(pfd[0]);
- if (!PkgInteractive)
- dup2(DebugFD, 1);
+ dup2(DebugFD, 1);
close(2);
close(pfd[1]);
if (isDebug())
diff --git a/release/sysinstall/sysinstall.h b/release/sysinstall/sysinstall.h
index 2d3bf6f05158..e4a3fc1261ec 100644
--- a/release/sysinstall/sysinstall.h
+++ b/release/sysinstall/sysinstall.h
@@ -341,7 +341,6 @@ extern Boolean RunningAsInit; /* Are we running stand-alone? */
extern Boolean DialogActive; /* Is the dialog() stuff up? */
extern Boolean ColorDisplay; /* Are we on a color display? */
extern Boolean OnVTY; /* On a syscons VTY? */
-Boolean PkgInteractive; /* Is the package going to spew at us? */
Boolean USAResident; /* Are we cryptographically challenged? */
extern Variable *VarHead; /* The head of the variable chain */
extern Device *mediaDevice; /* Where we're getting our distribution from */