From 495e2a647fdbbb77bff9c0806e191cc1bb238dde Mon Sep 17 00:00:00 2001
From: jkh <jkh@FreeBSD.org>
Date: Fri, 19 May 1995 21:30:35 +0000
Subject: [PATCH] More assorted verbosity.  Also don't log informational
 messages.

---
 release/sysinstall/command.c  | 4 ++--
 release/sysinstall/install.c  | 3 ++-
 release/sysinstall/msg.c      | 4 +---
 release/sysinstall/system.c   | 3 ++-
 usr.sbin/sade/command.c       | 4 ++--
 usr.sbin/sade/install.c       | 3 ++-
 usr.sbin/sade/msg.c           | 4 +---
 usr.sbin/sade/system.c        | 3 ++-
 usr.sbin/sysinstall/command.c | 4 ++--
 usr.sbin/sysinstall/install.c | 3 ++-
 usr.sbin/sysinstall/msg.c     | 4 +---
 usr.sbin/sysinstall/system.c  | 3 ++-
 12 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/release/sysinstall/command.c b/release/sysinstall/command.c
index 08a58a1f3a2c..4b84376efc00 100644
--- a/release/sysinstall/command.c
+++ b/release/sysinstall/command.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: command.c,v 1.6 1995/05/18 09:01:44 jkh Exp $
+ * $Id: command.c,v 1.7 1995/05/18 23:36:21 gpalmer Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -172,7 +172,7 @@ command_execute(void)
 	    else {
 		/* It's a function pointer - call it with the key and the data */
 		func = (commandFunc)commandStack[i]->cmds[j].ptr;
-		msgNotify("Executing internal command @ %0x", func);
+		msgNotify("%x: Execute(%s, %s)", func, commandStack[i]->key, commandStack[i]->cmds[j].data);
 		ret = (*func)(commandStack[i]->key, commandStack[i]->cmds[j].data);
 		msgDebug("Function @ %x returns status %d\n", commandStack[i]->cmds[j].ptr, ret);
 	    }
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index a96042b49f7e..b039ec0f8431 100644
--- a/release/sysinstall/install.c
+++ b/release/sysinstall/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: install.c,v 1.29 1995/05/19 01:49:57 gpalmer Exp $
+ * $Id: install.c,v 1.30 1995/05/19 15:56:01 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -186,6 +186,7 @@ make_filesystems(void)
 			else {
 			    extern int makedevs(void);
 
+			    msgNotify("Making device files");
 			    if (Mkdir("/mnt/dev", NULL)
 				|| chdir("/mnt/dev")
 				|| makedevs())
diff --git a/release/sysinstall/msg.c b/release/sysinstall/msg.c
index 8bf9f0db2a76..d5af5a6d2134 100644
--- a/release/sysinstall/msg.c
+++ b/release/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.13 1995/05/18 14:11:16 jkh Exp $
+ * $Id: msg.c,v 1.14 1995/05/19 15:56:02 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -61,8 +61,6 @@ msgYap(char *fmt, ...)
     mvaddstr(23, 0, errstr);
     attrset(attrs);
     refresh();
-    if (OnVTY)
-	msgDebug("Informational message `%s'\n", errstr);
     free(errstr);
 }
 
diff --git a/release/sysinstall/system.c b/release/sysinstall/system.c
index d459203bb22c..0e112b01e9d0 100644
--- a/release/sysinstall/system.c
+++ b/release/sysinstall/system.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: system.c,v 1.18 1995/05/19 04:17:38 jkh Exp $
+ * $Id: system.c,v 1.19 1995/05/19 16:58:58 jkh Exp $
  *
  * Jordan Hubbard
  *
@@ -273,6 +273,7 @@ systemChangeScreenmap(const u_char newmap[])
 	if (ioctl(0, PIO_SCRNMAP, newmap) < 0)
 	    msgConfirm("Sorry!  Unable to load the screenmap for %s",
 		       getenv("LANG"));
+	dialog_clear();
     }
 }
 
diff --git a/usr.sbin/sade/command.c b/usr.sbin/sade/command.c
index 08a58a1f3a2c..4b84376efc00 100644
--- a/usr.sbin/sade/command.c
+++ b/usr.sbin/sade/command.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: command.c,v 1.6 1995/05/18 09:01:44 jkh Exp $
+ * $Id: command.c,v 1.7 1995/05/18 23:36:21 gpalmer Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -172,7 +172,7 @@ command_execute(void)
 	    else {
 		/* It's a function pointer - call it with the key and the data */
 		func = (commandFunc)commandStack[i]->cmds[j].ptr;
-		msgNotify("Executing internal command @ %0x", func);
+		msgNotify("%x: Execute(%s, %s)", func, commandStack[i]->key, commandStack[i]->cmds[j].data);
 		ret = (*func)(commandStack[i]->key, commandStack[i]->cmds[j].data);
 		msgDebug("Function @ %x returns status %d\n", commandStack[i]->cmds[j].ptr, ret);
 	    }
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index a96042b49f7e..b039ec0f8431 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: install.c,v 1.29 1995/05/19 01:49:57 gpalmer Exp $
+ * $Id: install.c,v 1.30 1995/05/19 15:56:01 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -186,6 +186,7 @@ make_filesystems(void)
 			else {
 			    extern int makedevs(void);
 
+			    msgNotify("Making device files");
 			    if (Mkdir("/mnt/dev", NULL)
 				|| chdir("/mnt/dev")
 				|| makedevs())
diff --git a/usr.sbin/sade/msg.c b/usr.sbin/sade/msg.c
index 8bf9f0db2a76..d5af5a6d2134 100644
--- a/usr.sbin/sade/msg.c
+++ b/usr.sbin/sade/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.13 1995/05/18 14:11:16 jkh Exp $
+ * $Id: msg.c,v 1.14 1995/05/19 15:56:02 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -61,8 +61,6 @@ msgYap(char *fmt, ...)
     mvaddstr(23, 0, errstr);
     attrset(attrs);
     refresh();
-    if (OnVTY)
-	msgDebug("Informational message `%s'\n", errstr);
     free(errstr);
 }
 
diff --git a/usr.sbin/sade/system.c b/usr.sbin/sade/system.c
index d459203bb22c..0e112b01e9d0 100644
--- a/usr.sbin/sade/system.c
+++ b/usr.sbin/sade/system.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: system.c,v 1.18 1995/05/19 04:17:38 jkh Exp $
+ * $Id: system.c,v 1.19 1995/05/19 16:58:58 jkh Exp $
  *
  * Jordan Hubbard
  *
@@ -273,6 +273,7 @@ systemChangeScreenmap(const u_char newmap[])
 	if (ioctl(0, PIO_SCRNMAP, newmap) < 0)
 	    msgConfirm("Sorry!  Unable to load the screenmap for %s",
 		       getenv("LANG"));
+	dialog_clear();
     }
 }
 
diff --git a/usr.sbin/sysinstall/command.c b/usr.sbin/sysinstall/command.c
index 08a58a1f3a2c..4b84376efc00 100644
--- a/usr.sbin/sysinstall/command.c
+++ b/usr.sbin/sysinstall/command.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: command.c,v 1.6 1995/05/18 09:01:44 jkh Exp $
+ * $Id: command.c,v 1.7 1995/05/18 23:36:21 gpalmer Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -172,7 +172,7 @@ command_execute(void)
 	    else {
 		/* It's a function pointer - call it with the key and the data */
 		func = (commandFunc)commandStack[i]->cmds[j].ptr;
-		msgNotify("Executing internal command @ %0x", func);
+		msgNotify("%x: Execute(%s, %s)", func, commandStack[i]->key, commandStack[i]->cmds[j].data);
 		ret = (*func)(commandStack[i]->key, commandStack[i]->cmds[j].data);
 		msgDebug("Function @ %x returns status %d\n", commandStack[i]->cmds[j].ptr, ret);
 	    }
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index a96042b49f7e..b039ec0f8431 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: install.c,v 1.29 1995/05/19 01:49:57 gpalmer Exp $
+ * $Id: install.c,v 1.30 1995/05/19 15:56:01 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -186,6 +186,7 @@ make_filesystems(void)
 			else {
 			    extern int makedevs(void);
 
+			    msgNotify("Making device files");
 			    if (Mkdir("/mnt/dev", NULL)
 				|| chdir("/mnt/dev")
 				|| makedevs())
diff --git a/usr.sbin/sysinstall/msg.c b/usr.sbin/sysinstall/msg.c
index 8bf9f0db2a76..d5af5a6d2134 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.13 1995/05/18 14:11:16 jkh Exp $
+ * $Id: msg.c,v 1.14 1995/05/19 15:56:02 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -61,8 +61,6 @@ msgYap(char *fmt, ...)
     mvaddstr(23, 0, errstr);
     attrset(attrs);
     refresh();
-    if (OnVTY)
-	msgDebug("Informational message `%s'\n", errstr);
     free(errstr);
 }
 
diff --git a/usr.sbin/sysinstall/system.c b/usr.sbin/sysinstall/system.c
index d459203bb22c..0e112b01e9d0 100644
--- a/usr.sbin/sysinstall/system.c
+++ b/usr.sbin/sysinstall/system.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: system.c,v 1.18 1995/05/19 04:17:38 jkh Exp $
+ * $Id: system.c,v 1.19 1995/05/19 16:58:58 jkh Exp $
  *
  * Jordan Hubbard
  *
@@ -273,6 +273,7 @@ systemChangeScreenmap(const u_char newmap[])
 	if (ioctl(0, PIO_SCRNMAP, newmap) < 0)
 	    msgConfirm("Sorry!  Unable to load the screenmap for %s",
 		       getenv("LANG"));
+	dialog_clear();
     }
 }