12 files changed, 30 insertions, 18 deletions

diff --git a/release/sysinstall/command.c b/release/sysinstall/command.c
index 4b84376efc00b..17289640f5cd1 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.7 1995/05/18 23:36:21 gpalmer Exp $
+ * $Id: command.c,v 1.8 1995/05/19 21:30:32 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -165,7 +165,7 @@ command_execute(void)
 	for (j = 0; j < commandStack[i]->ncmds; j++) {
 	    /* If it's a shell command, run system on it */
 	    if (commandStack[i]->cmds[j].type == CMD_SHELL) {
-		msgNotify("Executing command: %s", commandStack[i]->cmds[j].ptr);
+		msgNotify("Doing %s", commandStack[i]->cmds[j].ptr);
 		ret = vsystem((char *)commandStack[i]->cmds[j].ptr);
 		msgDebug("Command `%s' returns status %d\n", commandStack[i]->cmds[j].ptr, ret);
 	    }
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index 22788b0f43074..acf83f68f50c5 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.34 1995/05/20 10:33:03 jkh Exp $
+ * $Id: install.c,v 1.35 1995/05/20 11:13:56 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -280,6 +280,9 @@ cpio_extract(void)
 	while (CpioFD == -1) {
 	    msgConfirm("Please Insert CPIO floppy in floppy drive 0");
 	    CpioFD = open("/dev/rfd0", O_RDONLY);
+	    if (CpioFD >= 0)
+		break;
+	    msgDebug("Error on open of cpio floppy: %s (%d)\n", strerror(errno), errno);
 	}
 	chroot("/mnt");	chdir("/");
 	msgNotify("Extracting contents of CPIO floppy...");
diff --git a/release/sysinstall/msg.c b/release/sysinstall/msg.c
index 5acd662f57657..ccfaff6b35cd7 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.17 1995/05/20 08:31:42 jkh Exp $
+ * $Id: msg.c,v 1.18 1995/05/20 10:33:10 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -210,6 +210,7 @@ msgNotify(char *fmt, ...)
     use_helpfile(NULL);
     msgDebug("Notify: %s\n", errstr);
     dialog_msgbox("Information Dialog", errstr, -1, -1, 0);
+    dialog_clear();
     free(errstr);
 }
 
diff --git a/release/sysinstall/system.c b/release/sysinstall/system.c
index e1a7ded7fcd47..28efd399544ae 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.20 1995/05/19 21:30:35 jkh Exp $
+ * $Id: system.c,v 1.21 1995/05/20 08:31:43 jkh Exp $
  *
  * Jordan Hubbard
  *
@@ -295,7 +295,7 @@ vsystem(char *fmt, ...)
     vsnprintf(cmd, FILENAME_MAX, fmt, args);
     va_end(args);
     omask = sigblock(sigmask(SIGCHLD));
-    msgNotify("Executing command: %s", cmd);
+    msgDebug("Executing command `%s'", cmd);
     switch(pid = vfork()) {
     case -1:			/* error */
 	(void)sigsetmask(omask);
diff --git a/usr.sbin/sade/command.c b/usr.sbin/sade/command.c
index 4b84376efc00b..17289640f5cd1 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.7 1995/05/18 23:36:21 gpalmer Exp $
+ * $Id: command.c,v 1.8 1995/05/19 21:30:32 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -165,7 +165,7 @@ command_execute(void)
 	for (j = 0; j < commandStack[i]->ncmds; j++) {
 	    /* If it's a shell command, run system on it */
 	    if (commandStack[i]->cmds[j].type == CMD_SHELL) {
-		msgNotify("Executing command: %s", commandStack[i]->cmds[j].ptr);
+		msgNotify("Doing %s", commandStack[i]->cmds[j].ptr);
 		ret = vsystem((char *)commandStack[i]->cmds[j].ptr);
 		msgDebug("Command `%s' 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 22788b0f43074..acf83f68f50c5 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.34 1995/05/20 10:33:03 jkh Exp $
+ * $Id: install.c,v 1.35 1995/05/20 11:13:56 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -280,6 +280,9 @@ cpio_extract(void)
 	while (CpioFD == -1) {
 	    msgConfirm("Please Insert CPIO floppy in floppy drive 0");
 	    CpioFD = open("/dev/rfd0", O_RDONLY);
+	    if (CpioFD >= 0)
+		break;
+	    msgDebug("Error on open of cpio floppy: %s (%d)\n", strerror(errno), errno);
 	}
 	chroot("/mnt");	chdir("/");
 	msgNotify("Extracting contents of CPIO floppy...");
diff --git a/usr.sbin/sade/msg.c b/usr.sbin/sade/msg.c
index 5acd662f57657..ccfaff6b35cd7 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.17 1995/05/20 08:31:42 jkh Exp $
+ * $Id: msg.c,v 1.18 1995/05/20 10:33:10 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -210,6 +210,7 @@ msgNotify(char *fmt, ...)
     use_helpfile(NULL);
     msgDebug("Notify: %s\n", errstr);
     dialog_msgbox("Information Dialog", errstr, -1, -1, 0);
+    dialog_clear();
     free(errstr);
 }
 
diff --git a/usr.sbin/sade/system.c b/usr.sbin/sade/system.c
index e1a7ded7fcd47..28efd399544ae 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.20 1995/05/19 21:30:35 jkh Exp $
+ * $Id: system.c,v 1.21 1995/05/20 08:31:43 jkh Exp $
  *
  * Jordan Hubbard
  *
@@ -295,7 +295,7 @@ vsystem(char *fmt, ...)
     vsnprintf(cmd, FILENAME_MAX, fmt, args);
     va_end(args);
     omask = sigblock(sigmask(SIGCHLD));
-    msgNotify("Executing command: %s", cmd);
+    msgDebug("Executing command `%s'", cmd);
     switch(pid = vfork()) {
     case -1:			/* error */
 	(void)sigsetmask(omask);
diff --git a/usr.sbin/sysinstall/command.c b/usr.sbin/sysinstall/command.c
index 4b84376efc00b..17289640f5cd1 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.7 1995/05/18 23:36:21 gpalmer Exp $
+ * $Id: command.c,v 1.8 1995/05/19 21:30:32 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -165,7 +165,7 @@ command_execute(void)
 	for (j = 0; j < commandStack[i]->ncmds; j++) {
 	    /* If it's a shell command, run system on it */
 	    if (commandStack[i]->cmds[j].type == CMD_SHELL) {
-		msgNotify("Executing command: %s", commandStack[i]->cmds[j].ptr);
+		msgNotify("Doing %s", commandStack[i]->cmds[j].ptr);
 		ret = vsystem((char *)commandStack[i]->cmds[j].ptr);
 		msgDebug("Command `%s' 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 22788b0f43074..acf83f68f50c5 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.34 1995/05/20 10:33:03 jkh Exp $
+ * $Id: install.c,v 1.35 1995/05/20 11:13:56 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -280,6 +280,9 @@ cpio_extract(void)
 	while (CpioFD == -1) {
 	    msgConfirm("Please Insert CPIO floppy in floppy drive 0");
 	    CpioFD = open("/dev/rfd0", O_RDONLY);
+	    if (CpioFD >= 0)
+		break;
+	    msgDebug("Error on open of cpio floppy: %s (%d)\n", strerror(errno), errno);
 	}
 	chroot("/mnt");	chdir("/");
 	msgNotify("Extracting contents of CPIO floppy...");
diff --git a/usr.sbin/sysinstall/msg.c b/usr.sbin/sysinstall/msg.c
index 5acd662f57657..ccfaff6b35cd7 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.17 1995/05/20 08:31:42 jkh Exp $
+ * $Id: msg.c,v 1.18 1995/05/20 10:33:10 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -210,6 +210,7 @@ msgNotify(char *fmt, ...)
     use_helpfile(NULL);
     msgDebug("Notify: %s\n", errstr);
     dialog_msgbox("Information Dialog", errstr, -1, -1, 0);
+    dialog_clear();
     free(errstr);
 }
 
diff --git a/usr.sbin/sysinstall/system.c b/usr.sbin/sysinstall/system.c
index e1a7ded7fcd47..28efd399544ae 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.20 1995/05/19 21:30:35 jkh Exp $
+ * $Id: system.c,v 1.21 1995/05/20 08:31:43 jkh Exp $
  *
  * Jordan Hubbard
  *
@@ -295,7 +295,7 @@ vsystem(char *fmt, ...)
     vsnprintf(cmd, FILENAME_MAX, fmt, args);
     va_end(args);
     omask = sigblock(sigmask(SIGCHLD));
-    msgNotify("Executing command: %s", cmd);
+    msgDebug("Executing command `%s'", cmd);
     switch(pid = vfork()) {
     case -1:			/* error */
 	(void)sigsetmask(omask);