Remove PkgInteractive hack - it won't work like this.

4 files changed, 1 insertions, 7 deletions

diff --git a/release/sysinstall/globals.c b/release/sysinstall/globals.c
index 31eb3a7..2dccef2 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 29a4ca4..6e12945 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 1959df7..8901d08 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 2d3bf6f..e4a3fc1 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	*/