1. Copy the boot floppy into /stand before extracting the CPIO floppy.

2. On Justin's advice, remind the user when they should switch back
   from the debugging screen, if they're looking over there.

1 files changed, 18 insertions, 4 deletions

diff --git a/usr.sbin/sysinstall/msg.c b/usr.sbin/sysinstall/msg.c
index b38be4c..8bf9f0d 100644
--- a/usr.sbin/sysinstall/msg.c
+++ b/usr.sbin/sysinstall/msg.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: msg.c,v 1.12 1995/05/18 12:57:54 jkh Exp $
+ * $Id: msg.c,v 1.13 1995/05/18 14:11:16 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -61,6 +61,8 @@ msgYap(char *fmt, ...)
     mvaddstr(23, 0, errstr);
     attrset(attrs);
     refresh();
+    if (OnVTY)
+	msgDebug("Informational message `%s'\n", errstr);
     free(errstr);
 }
 
@@ -81,6 +83,8 @@ msgInfo(char *fmt, ...)
     mvaddstr(23, 0, errstr);
     attrset(attrs);
     refresh();
+    if (OnVTY)
+	msgDebug("Informational message `%s'\n", errstr);
     free(errstr);
 }
 
@@ -103,6 +107,8 @@ msgWarn(char *fmt, ...)
     mvaddstr(23, 0, errstr);
     attrset(attrs);
     refresh();
+    if (OnVTY)
+	msgDebug("Warning message `%s'\n", errstr);
     free(errstr);
 }
 
@@ -125,6 +131,8 @@ msgError(char *fmt, ...)
     mvaddstr(23, 0, errstr);
     attrset(attrs);
     refresh();
+    if (OnVTY)
+	msgDebug("Error message `%s'\n", errstr);
     free(errstr);
 }
 
@@ -153,6 +161,8 @@ msgFatal(char *fmt, ...)
 	addstr("QUIT");
     attrset(attrs);
     refresh();
+    if (OnVTY)
+	msgDebug("Fatal error `%s'!\n", errstr);
     free(errstr);
     getch();
     systemShutdown();
@@ -171,6 +181,8 @@ msgConfirm(char *fmt, ...)
     va_end(args);
     use_helpline(NULL);
     use_helpfile(NULL);
+    if (OnVTY)
+	msgDebug("User confirmation requested (type ALT-F1)\n");
     dialog_notify(errstr);
     free(errstr);
 }
@@ -189,7 +201,7 @@ msgNotify(char *fmt, ...)
     va_end(args);
     use_helpline(NULL);
     use_helpfile(NULL);
-    msgDebug("[%s]\n", errstr);
+    msgDebug("Notify: %s\n", errstr);
     w = dupwin(newscr);
     dialog_msgbox("Information Dialog", errstr, -1, -1, 0);
     touchwin(w);
@@ -214,11 +226,12 @@ msgYesNo(char *fmt, ...)
     use_helpline(NULL);
     use_helpfile(NULL);
     w = dupwin(newscr);
+    if (OnVTY)
+	msgDebug("User decision requested (type ALT-F1)\n");
     ret = dialog_yesno("User Confirmation Requested", errstr, -1, -1);
     touchwin(w);
     wrefresh(w);
     delwin(w);
-    msgDebug("[User answers %s to \"%s\"]\n", ret ? "no" : "yes", errstr);
     free(errstr);
     return ret;
 }
@@ -244,11 +257,12 @@ msgGetInput(char *buf, char *fmt, ...)
     else
 	input_buffer[0] = '\0';
     w = dupwin(newscr);
+    if (OnVTY)
+	msgDebug("User input requested (type ALT-F1)\n");
     rval = dialog_inputbox("Value Required", errstr, -1, -1, input_buffer);
     touchwin(w);
     wrefresh(w);
     delwin(w);
-    msgDebug("[input request \"%s\" returns %d status]\n", errstr, rval);
     free(errstr);
     if (!rval)
 	return input_buffer;