We still need a hack for rsaref package; add it. This doesn't

affect CDs since they don't contain the rsaref package anyway.

1 files changed, 7 insertions, 0 deletions

diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 42e8fcb..67f1bb8 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -52,6 +52,11 @@
 #include <unistd.h>
 #include <termios.h>
 
+/* Hack for rsaref package add, which displays interactive license.
+ * Used by package.c
+ */
+int _interactiveHack;
+
 static void	create_termcap(void);
 static void	fixit_common(void);
 
@@ -572,6 +577,7 @@ nodisks:
 	    "load the rsaref package from the current media?  Some restrictions on\n"
 	    "usage may apply, so be sure to read the package installation output!")) {
 	    dialog_clear();
+	    _interactiveHack = 1;
 	    if (DITEM_STATUS(package_add("rsaref")) != DITEM_SUCCESS) {
 		msgConfirm("Unable to find an rsaref package on the current intallation media.\n"
 		    	   "This is probably because you are installing from a CDROM which\n"
@@ -581,6 +587,7 @@ nodisks:
 			   "the rsaref package manually through the Packages menu.");
 	    }
 	    dialog_clear();
+	    _interactiveHack = 0;
 	}
     }
     else {