9 files changed, 84 insertions, 63 deletions

diff --git a/release/sysinstall/disks.c b/release/sysinstall/disks.c
index b66c992f58ae..c4d223f89840 100644
--- a/release/sysinstall/disks.c
+++ b/release/sysinstall/disks.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: disks.c,v 1.66 1996/10/03 06:01:31 jkh Exp $
+ * $Id: disks.c,v 1.67 1996/10/04 13:33:41 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -369,13 +369,12 @@ diskPartition(Device *dev, Disk *d)
 	    break;
 
 	case 'W':
-	    if (!msgYesNo("WARNING:  This should only be used for modifying an\n"
-			  "EXISTING installation - If you are installing FreeBSD\n"
-			  "for the first time then you should simply hit 'Q' now."
-			  "Your changes will be committed in one batch at the end\n"
-			  "of this section and do not have to be written now.\n\n"
+	    if (!msgYesNo("WARNING:  This should only be used when modifying an EXISTING\n"
+			  "installation.  If you are installing FreeBSD for the first time\n"
+			  "then you should simply type Q when you're finished here and your\n"
+			  "changes will be committed in one batch automatically at the end of\n"
+			  "these questions.\n\n"
 			  "Are you absolutely sure you want to do this now?")) {
-
 		variable_set2(DISK_PARTITIONED, "yes");
 
 		/* Don't trash the MBR if the first (and therefore only) chunk is marked for a truly dedicated
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index 5b052e49c50b..83f762f8099e 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.126 1996/10/03 08:54:37 jkh Exp $
+ * $Id: install.c,v 1.127 1996/10/04 13:33:43 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -596,6 +596,7 @@ installFixup(dialogMenuItem *self)
 	if (file_readable("/kernel.GENERIC")) {
 	    /* Snapshot any boot -c changes back to the GENERIC kernel */
 	    save_userconfig_to_kernel("/kernel.GENERIC");
+	    dialog_clear();
 
 	    if (vsystem("cp -p /kernel.GENERIC /kernel")) {
 		msgConfirm("Unable to link /kernel into place!");
@@ -930,27 +931,32 @@ save_userconfig_to_kernel(char *kern)
 	msgDebug("Can't read device information for kernel image %s\n", kern);
 	return;
     }
-    msgDebug("Kernel open, getting core ISA devices\n");
     c_isa = uc_getdev(core, "-isa");
     for (d = 0; d < c_isa->ac; d++) {
-	msgDebug("Outer loop, c_isa->av[%d] = %s\n", d, c_isa->av[d]);
+	if (isDebug())
+	    msgDebug("Outer loop, c_isa->av[%d] = %s\n", d, c_isa->av[d]);
 	if (strcmp(c_isa->av[d], "npx0")) { /* special case npx0, which
 					       mucks with its id_irq member */
 	    c_dev = uc_getdev(core, c_isa->av[d]);
 	    b_dev = uc_getdev(boot, c_isa->av[d]);
 	    for (i = 0; i < c_dev->ac; i++) {
-		msgDebug("Inner loop, c_dev->av[%d] = %s\n", i, c_dev->av[i]);
+		if (isDebug())
+		    msgDebug("Inner loop, c_dev->av[%d] = %s\n", i, c_dev->av[i]);
 		if (strcmp(c_dev->av[i], b_dev->av[i])) {
-		    msgDebug("%s %s changed: %s (boot) -> %s (core)\n",
-			     c_dev->av[0], isa_list[i], b_dev->av[i], c_dev->av[i]);
+		    if (isDebug())
+			msgDebug("%s %s changed: %s (boot) -> %s (core)\n",
+				 c_dev->av[0], isa_list[i], b_dev->av[i], c_dev->av[i]);
 		    isa_setdev(boot, c_dev);
 		}
 	    }
 	}
-	else
-	    msgDebug("skipping npx0\n");
+	else {
+	    if (isDebug())
+		msgDebug("skipping npx0\n");
+	}
     }
-    msgDebug("Closing kernels\n");
+    if (isDebug())
+	msgDebug("Closing kernels\n");
     uc_close(core, 0);
     uc_close(boot, 1);
 }
diff --git a/release/sysinstall/label.c b/release/sysinstall/label.c
index 4be5dcda13e4..760a091fcf29 100644
--- a/release/sysinstall/label.c
+++ b/release/sysinstall/label.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: label.c,v 1.60 1996/10/01 14:08:23 jkh Exp $
+ * $Id: label.c,v 1.61 1996/10/02 02:19:35 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -855,10 +855,12 @@ diskLabel(char *str)
 	    break;
 
 	case 'W':
-	    if (!msgYesNo("You also have the option of doing this later in one final 'commit'\n"
-			  "operation, and it should also be noted that this option is NOT for\n"
-			  "use during new installations but rather for modifying existing ones.\n\n"
-			  "Are you absolutely SURE you want to do this now?")) {
+	    if (!msgYesNo("WARNING:  This should only be used when modifying an EXISTING\n"
+			  "installation.  If you are installing FreeBSD for the first time\n"
+			  "then you should simply type Q when you're finished here and your\n"
+			  "changes will be committed in one batch automatically at the end of\n"
+			  "these questions.\n\n"
+			  "Are you absolutely sure you want to do this now?")) {
 		variable_set2(DISK_LABELLED, "yes");
 		diskLabelCommit(NULL);
 	    }
diff --git a/usr.sbin/sade/disks.c b/usr.sbin/sade/disks.c
index b66c992f58ae..c4d223f89840 100644
--- a/usr.sbin/sade/disks.c
+++ b/usr.sbin/sade/disks.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: disks.c,v 1.66 1996/10/03 06:01:31 jkh Exp $
+ * $Id: disks.c,v 1.67 1996/10/04 13:33:41 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -369,13 +369,12 @@ diskPartition(Device *dev, Disk *d)
 	    break;
 
 	case 'W':
-	    if (!msgYesNo("WARNING:  This should only be used for modifying an\n"
-			  "EXISTING installation - If you are installing FreeBSD\n"
-			  "for the first time then you should simply hit 'Q' now."
-			  "Your changes will be committed in one batch at the end\n"
-			  "of this section and do not have to be written now.\n\n"
+	    if (!msgYesNo("WARNING:  This should only be used when modifying an EXISTING\n"
+			  "installation.  If you are installing FreeBSD for the first time\n"
+			  "then you should simply type Q when you're finished here and your\n"
+			  "changes will be committed in one batch automatically at the end of\n"
+			  "these questions.\n\n"
 			  "Are you absolutely sure you want to do this now?")) {
-
 		variable_set2(DISK_PARTITIONED, "yes");
 
 		/* Don't trash the MBR if the first (and therefore only) chunk is marked for a truly dedicated
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 5b052e49c50b..83f762f8099e 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.126 1996/10/03 08:54:37 jkh Exp $
+ * $Id: install.c,v 1.127 1996/10/04 13:33:43 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -596,6 +596,7 @@ installFixup(dialogMenuItem *self)
 	if (file_readable("/kernel.GENERIC")) {
 	    /* Snapshot any boot -c changes back to the GENERIC kernel */
 	    save_userconfig_to_kernel("/kernel.GENERIC");
+	    dialog_clear();
 
 	    if (vsystem("cp -p /kernel.GENERIC /kernel")) {
 		msgConfirm("Unable to link /kernel into place!");
@@ -930,27 +931,32 @@ save_userconfig_to_kernel(char *kern)
 	msgDebug("Can't read device information for kernel image %s\n", kern);
 	return;
     }
-    msgDebug("Kernel open, getting core ISA devices\n");
     c_isa = uc_getdev(core, "-isa");
     for (d = 0; d < c_isa->ac; d++) {
-	msgDebug("Outer loop, c_isa->av[%d] = %s\n", d, c_isa->av[d]);
+	if (isDebug())
+	    msgDebug("Outer loop, c_isa->av[%d] = %s\n", d, c_isa->av[d]);
 	if (strcmp(c_isa->av[d], "npx0")) { /* special case npx0, which
 					       mucks with its id_irq member */
 	    c_dev = uc_getdev(core, c_isa->av[d]);
 	    b_dev = uc_getdev(boot, c_isa->av[d]);
 	    for (i = 0; i < c_dev->ac; i++) {
-		msgDebug("Inner loop, c_dev->av[%d] = %s\n", i, c_dev->av[i]);
+		if (isDebug())
+		    msgDebug("Inner loop, c_dev->av[%d] = %s\n", i, c_dev->av[i]);
 		if (strcmp(c_dev->av[i], b_dev->av[i])) {
-		    msgDebug("%s %s changed: %s (boot) -> %s (core)\n",
-			     c_dev->av[0], isa_list[i], b_dev->av[i], c_dev->av[i]);
+		    if (isDebug())
+			msgDebug("%s %s changed: %s (boot) -> %s (core)\n",
+				 c_dev->av[0], isa_list[i], b_dev->av[i], c_dev->av[i]);
 		    isa_setdev(boot, c_dev);
 		}
 	    }
 	}
-	else
-	    msgDebug("skipping npx0\n");
+	else {
+	    if (isDebug())
+		msgDebug("skipping npx0\n");
+	}
     }
-    msgDebug("Closing kernels\n");
+    if (isDebug())
+	msgDebug("Closing kernels\n");
     uc_close(core, 0);
     uc_close(boot, 1);
 }
diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c
index 4be5dcda13e4..760a091fcf29 100644
--- a/usr.sbin/sade/label.c
+++ b/usr.sbin/sade/label.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: label.c,v 1.60 1996/10/01 14:08:23 jkh Exp $
+ * $Id: label.c,v 1.61 1996/10/02 02:19:35 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -855,10 +855,12 @@ diskLabel(char *str)
 	    break;
 
 	case 'W':
-	    if (!msgYesNo("You also have the option of doing this later in one final 'commit'\n"
-			  "operation, and it should also be noted that this option is NOT for\n"
-			  "use during new installations but rather for modifying existing ones.\n\n"
-			  "Are you absolutely SURE you want to do this now?")) {
+	    if (!msgYesNo("WARNING:  This should only be used when modifying an EXISTING\n"
+			  "installation.  If you are installing FreeBSD for the first time\n"
+			  "then you should simply type Q when you're finished here and your\n"
+			  "changes will be committed in one batch automatically at the end of\n"
+			  "these questions.\n\n"
+			  "Are you absolutely sure you want to do this now?")) {
 		variable_set2(DISK_LABELLED, "yes");
 		diskLabelCommit(NULL);
 	    }
diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c
index b66c992f58ae..c4d223f89840 100644
--- a/usr.sbin/sysinstall/disks.c
+++ b/usr.sbin/sysinstall/disks.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: disks.c,v 1.66 1996/10/03 06:01:31 jkh Exp $
+ * $Id: disks.c,v 1.67 1996/10/04 13:33:41 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -369,13 +369,12 @@ diskPartition(Device *dev, Disk *d)
 	    break;
 
 	case 'W':
-	    if (!msgYesNo("WARNING:  This should only be used for modifying an\n"
-			  "EXISTING installation - If you are installing FreeBSD\n"
-			  "for the first time then you should simply hit 'Q' now."
-			  "Your changes will be committed in one batch at the end\n"
-			  "of this section and do not have to be written now.\n\n"
+	    if (!msgYesNo("WARNING:  This should only be used when modifying an EXISTING\n"
+			  "installation.  If you are installing FreeBSD for the first time\n"
+			  "then you should simply type Q when you're finished here and your\n"
+			  "changes will be committed in one batch automatically at the end of\n"
+			  "these questions.\n\n"
 			  "Are you absolutely sure you want to do this now?")) {
-
 		variable_set2(DISK_PARTITIONED, "yes");
 
 		/* Don't trash the MBR if the first (and therefore only) chunk is marked for a truly dedicated
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 5b052e49c50b..83f762f8099e 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.126 1996/10/03 08:54:37 jkh Exp $
+ * $Id: install.c,v 1.127 1996/10/04 13:33:43 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -596,6 +596,7 @@ installFixup(dialogMenuItem *self)
 	if (file_readable("/kernel.GENERIC")) {
 	    /* Snapshot any boot -c changes back to the GENERIC kernel */
 	    save_userconfig_to_kernel("/kernel.GENERIC");
+	    dialog_clear();
 
 	    if (vsystem("cp -p /kernel.GENERIC /kernel")) {
 		msgConfirm("Unable to link /kernel into place!");
@@ -930,27 +931,32 @@ save_userconfig_to_kernel(char *kern)
 	msgDebug("Can't read device information for kernel image %s\n", kern);
 	return;
     }
-    msgDebug("Kernel open, getting core ISA devices\n");
     c_isa = uc_getdev(core, "-isa");
     for (d = 0; d < c_isa->ac; d++) {
-	msgDebug("Outer loop, c_isa->av[%d] = %s\n", d, c_isa->av[d]);
+	if (isDebug())
+	    msgDebug("Outer loop, c_isa->av[%d] = %s\n", d, c_isa->av[d]);
 	if (strcmp(c_isa->av[d], "npx0")) { /* special case npx0, which
 					       mucks with its id_irq member */
 	    c_dev = uc_getdev(core, c_isa->av[d]);
 	    b_dev = uc_getdev(boot, c_isa->av[d]);
 	    for (i = 0; i < c_dev->ac; i++) {
-		msgDebug("Inner loop, c_dev->av[%d] = %s\n", i, c_dev->av[i]);
+		if (isDebug())
+		    msgDebug("Inner loop, c_dev->av[%d] = %s\n", i, c_dev->av[i]);
 		if (strcmp(c_dev->av[i], b_dev->av[i])) {
-		    msgDebug("%s %s changed: %s (boot) -> %s (core)\n",
-			     c_dev->av[0], isa_list[i], b_dev->av[i], c_dev->av[i]);
+		    if (isDebug())
+			msgDebug("%s %s changed: %s (boot) -> %s (core)\n",
+				 c_dev->av[0], isa_list[i], b_dev->av[i], c_dev->av[i]);
 		    isa_setdev(boot, c_dev);
 		}
 	    }
 	}
-	else
-	    msgDebug("skipping npx0\n");
+	else {
+	    if (isDebug())
+		msgDebug("skipping npx0\n");
+	}
     }
-    msgDebug("Closing kernels\n");
+    if (isDebug())
+	msgDebug("Closing kernels\n");
     uc_close(core, 0);
     uc_close(boot, 1);
 }
diff --git a/usr.sbin/sysinstall/label.c b/usr.sbin/sysinstall/label.c
index 4be5dcda13e4..760a091fcf29 100644
--- a/usr.sbin/sysinstall/label.c
+++ b/usr.sbin/sysinstall/label.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: label.c,v 1.60 1996/10/01 14:08:23 jkh Exp $
+ * $Id: label.c,v 1.61 1996/10/02 02:19:35 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -855,10 +855,12 @@ diskLabel(char *str)
 	    break;
 
 	case 'W':
-	    if (!msgYesNo("You also have the option of doing this later in one final 'commit'\n"
-			  "operation, and it should also be noted that this option is NOT for\n"
-			  "use during new installations but rather for modifying existing ones.\n\n"
-			  "Are you absolutely SURE you want to do this now?")) {
+	    if (!msgYesNo("WARNING:  This should only be used when modifying an EXISTING\n"
+			  "installation.  If you are installing FreeBSD for the first time\n"
+			  "then you should simply type Q when you're finished here and your\n"
+			  "changes will be committed in one batch automatically at the end of\n"
+			  "these questions.\n\n"
+			  "Are you absolutely sure you want to do this now?")) {
 		variable_set2(DISK_LABELLED, "yes");
 		diskLabelCommit(NULL);
 	    }