diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index 8c3cdc7d0f22..77e25729be35 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.22 1995/05/18 10:43:51 jkh Exp $
+ * $Id: install.c,v 1.23 1995/05/18 13:20:53 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -145,10 +145,10 @@ make_filesystems(void)
     /* First look for the root device and mount it */
     for (i = 0; devs[i]; i++) {
 	disk = (Disk *)devs[i]->private;
+	msgDebug("Scanning disk %s for root filesystem\n", disk->name);
 	if (!disk->chunks)
 	    msgFatal("No chunk list found for %s!", disk->name);
-	c1 = disk->chunks->part;
-	while (c1) {
+	for (c1 = disk->chunks->part; c1; c1 = c1->next) {
 	    if (c1->type == freebsd) {
 		for (c2 = c1->part; c2; c2 = c2->next) {
 		    if (c2->type == part && c2->subtype != FS_SWAP &&
@@ -156,8 +156,10 @@ make_filesystems(void)
 			char dname[40];
 			PartInfo *p = (PartInfo *)c2->private;
 
-			if (strcmp(p->mountpoint, "/"))
+			if (strcmp(p->mountpoint, "/")) {
+			    msgConfirm("Warning: %s is marked as a root partition but is mounted on %s", c2->name, p->mountpoint);
 			    continue;
+			}
 			sprintf(dname, "/dev/%sa", disk->name);
 			if (p->newfs) {
 			    int i;
diff --git a/release/sysinstall/msg.c b/release/sysinstall/msg.c
index 2fc05f087b46..b38be4ca0c1d 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.11 1995/05/16 11:37:23 jkh Exp $
+ * $Id: msg.c,v 1.12 1995/05/18 12:57:54 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -189,7 +189,7 @@ msgNotify(char *fmt, ...)
     va_end(args);
     use_helpline(NULL);
     use_helpfile(NULL);
-    msgDebug("%s\n", errstr);
+    msgDebug("[%s]\n", errstr);
     w = dupwin(newscr);
     dialog_msgbox("Information Dialog", errstr, -1, -1, 0);
     touchwin(w);
@@ -218,7 +218,7 @@ msgYesNo(char *fmt, ...)
     touchwin(w);
     wrefresh(w);
     delwin(w);
-    msgDebug("User answers %s to \"%s\"\n", ret ? "no" : "yes", errstr);
+    msgDebug("[User answers %s to \"%s\"]\n", ret ? "no" : "yes", errstr);
     free(errstr);
     return ret;
 }
@@ -248,7 +248,7 @@ msgGetInput(char *buf, char *fmt, ...)
     touchwin(w);
     wrefresh(w);
     delwin(w);
-    msgDebug("input request \"%s\" returns %d status", errstr, rval);
+    msgDebug("[input request \"%s\" returns %d status]\n", errstr, rval);
     free(errstr);
     if (!rval)
 	return input_buffer;
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 8c3cdc7d0f22..77e25729be35 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.22 1995/05/18 10:43:51 jkh Exp $
+ * $Id: install.c,v 1.23 1995/05/18 13:20:53 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -145,10 +145,10 @@ make_filesystems(void)
     /* First look for the root device and mount it */
     for (i = 0; devs[i]; i++) {
 	disk = (Disk *)devs[i]->private;
+	msgDebug("Scanning disk %s for root filesystem\n", disk->name);
 	if (!disk->chunks)
 	    msgFatal("No chunk list found for %s!", disk->name);
-	c1 = disk->chunks->part;
-	while (c1) {
+	for (c1 = disk->chunks->part; c1; c1 = c1->next) {
 	    if (c1->type == freebsd) {
 		for (c2 = c1->part; c2; c2 = c2->next) {
 		    if (c2->type == part && c2->subtype != FS_SWAP &&
@@ -156,8 +156,10 @@ make_filesystems(void)
 			char dname[40];
 			PartInfo *p = (PartInfo *)c2->private;
 
-			if (strcmp(p->mountpoint, "/"))
+			if (strcmp(p->mountpoint, "/")) {
+			    msgConfirm("Warning: %s is marked as a root partition but is mounted on %s", c2->name, p->mountpoint);
 			    continue;
+			}
 			sprintf(dname, "/dev/%sa", disk->name);
 			if (p->newfs) {
 			    int i;
diff --git a/usr.sbin/sade/msg.c b/usr.sbin/sade/msg.c
index 2fc05f087b46..b38be4ca0c1d 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.11 1995/05/16 11:37:23 jkh Exp $
+ * $Id: msg.c,v 1.12 1995/05/18 12:57:54 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -189,7 +189,7 @@ msgNotify(char *fmt, ...)
     va_end(args);
     use_helpline(NULL);
     use_helpfile(NULL);
-    msgDebug("%s\n", errstr);
+    msgDebug("[%s]\n", errstr);
     w = dupwin(newscr);
     dialog_msgbox("Information Dialog", errstr, -1, -1, 0);
     touchwin(w);
@@ -218,7 +218,7 @@ msgYesNo(char *fmt, ...)
     touchwin(w);
     wrefresh(w);
     delwin(w);
-    msgDebug("User answers %s to \"%s\"\n", ret ? "no" : "yes", errstr);
+    msgDebug("[User answers %s to \"%s\"]\n", ret ? "no" : "yes", errstr);
     free(errstr);
     return ret;
 }
@@ -248,7 +248,7 @@ msgGetInput(char *buf, char *fmt, ...)
     touchwin(w);
     wrefresh(w);
     delwin(w);
-    msgDebug("input request \"%s\" returns %d status", errstr, rval);
+    msgDebug("[input request \"%s\" returns %d status]\n", errstr, rval);
     free(errstr);
     if (!rval)
 	return input_buffer;
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 8c3cdc7d0f22..77e25729be35 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.22 1995/05/18 10:43:51 jkh Exp $
+ * $Id: install.c,v 1.23 1995/05/18 13:20:53 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -145,10 +145,10 @@ make_filesystems(void)
     /* First look for the root device and mount it */
     for (i = 0; devs[i]; i++) {
 	disk = (Disk *)devs[i]->private;
+	msgDebug("Scanning disk %s for root filesystem\n", disk->name);
 	if (!disk->chunks)
 	    msgFatal("No chunk list found for %s!", disk->name);
-	c1 = disk->chunks->part;
-	while (c1) {
+	for (c1 = disk->chunks->part; c1; c1 = c1->next) {
 	    if (c1->type == freebsd) {
 		for (c2 = c1->part; c2; c2 = c2->next) {
 		    if (c2->type == part && c2->subtype != FS_SWAP &&
@@ -156,8 +156,10 @@ make_filesystems(void)
 			char dname[40];
 			PartInfo *p = (PartInfo *)c2->private;
 
-			if (strcmp(p->mountpoint, "/"))
+			if (strcmp(p->mountpoint, "/")) {
+			    msgConfirm("Warning: %s is marked as a root partition but is mounted on %s", c2->name, p->mountpoint);
 			    continue;
+			}
 			sprintf(dname, "/dev/%sa", disk->name);
 			if (p->newfs) {
 			    int i;
diff --git a/usr.sbin/sysinstall/msg.c b/usr.sbin/sysinstall/msg.c
index 2fc05f087b46..b38be4ca0c1d 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.11 1995/05/16 11:37:23 jkh Exp $
+ * $Id: msg.c,v 1.12 1995/05/18 12:57:54 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -189,7 +189,7 @@ msgNotify(char *fmt, ...)
     va_end(args);
     use_helpline(NULL);
     use_helpfile(NULL);
-    msgDebug("%s\n", errstr);
+    msgDebug("[%s]\n", errstr);
     w = dupwin(newscr);
     dialog_msgbox("Information Dialog", errstr, -1, -1, 0);
     touchwin(w);
@@ -218,7 +218,7 @@ msgYesNo(char *fmt, ...)
     touchwin(w);
     wrefresh(w);
     delwin(w);
-    msgDebug("User answers %s to \"%s\"\n", ret ? "no" : "yes", errstr);
+    msgDebug("[User answers %s to \"%s\"]\n", ret ? "no" : "yes", errstr);
     free(errstr);
     return ret;
 }
@@ -248,7 +248,7 @@ msgGetInput(char *buf, char *fmt, ...)
     touchwin(w);
     wrefresh(w);
     delwin(w);
-    msgDebug("input request \"%s\" returns %d status", errstr, rval);
+    msgDebug("[input request \"%s\" returns %d status]\n", errstr, rval);
     free(errstr);
     if (!rval)
 	return input_buffer;