1. Fix a looping bogon in configFstab().

2. Fix the gauge.
3. Don't shut down the media device gratuitously after getting the root
   floppy - it saves work later.

8 files changed, 19 insertions, 22 deletions

diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c
index a51f996..980bc57 100644
--- a/release/sysinstall/config.c
+++ b/release/sysinstall/config.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: config.c,v 1.12 1995/05/28 20:28:07 jkh Exp $
+ * $Id: config.c,v 1.13 1995/05/29 11:01:06 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -155,7 +155,7 @@ configFstab(void)
 	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)
+		    if (c2->type == part && c2->private)
 			chunk_list[nchunks++] = c2;
 		}
 	    }
diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c
index 75ff6fa..2e3e201 100644
--- a/release/sysinstall/dist.c
+++ b/release/sysinstall/dist.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: dist.c,v 1.31 1995/05/28 20:28:11 jkh Exp $
+ * $Id: dist.c,v 1.32 1995/05/29 11:01:10 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -314,7 +314,7 @@ distExtract(char *parent, Distribution *me)
 		goto punt;
 	    }
 	    snprintf(prompt, 80, "Extracting %s into %s directory...", me[i].my_name, me[i].my_dir);
-	    dialog_gauge(" Progress ", prompt, 8, 10, 10, 40, (numchunks / (chunk + 1)));
+	    dialog_gauge(" Progress ", prompt, 8, 15, 6, 40, (chunk + 1 ) / numchunks * 100);
 	    while ((n = read(fd, buf, sizeof buf)) > 0) {
 		retval = write(fd2, buf, n);
 		if (retval != n)
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index f501494..24f8a3a 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.66 1995/05/29 00:50:02 jkh Exp $
+ * $Id: install.c,v 1.67 1995/05/29 11:01:23 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -417,9 +417,8 @@ root_extract(void)
 		    (*mediaDevice->close)(mediaDevice, fd);
 		else
 		    close(fd);
-		if (mediaDevice->shutdown)
-		    (*mediaDevice->shutdown)(mediaDevice);
-	    } else {
+	    }
+	    else {
 		msgConfirm("Couldn't get root floppy image from %s\n, falling back to floppy.", mediaDevice->name);
 		if (mediaDevice->shutdown)
 		    (*mediaDevice->shutdown)(mediaDevice);
diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c
index a51f996..980bc57 100644
--- a/usr.sbin/sade/config.c
+++ b/usr.sbin/sade/config.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: config.c,v 1.12 1995/05/28 20:28:07 jkh Exp $
+ * $Id: config.c,v 1.13 1995/05/29 11:01:06 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -155,7 +155,7 @@ configFstab(void)
 	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)
+		    if (c2->type == part && c2->private)
 			chunk_list[nchunks++] = c2;
 		}
 	    }
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index f501494..24f8a3a 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.66 1995/05/29 00:50:02 jkh Exp $
+ * $Id: install.c,v 1.67 1995/05/29 11:01:23 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -417,9 +417,8 @@ root_extract(void)
 		    (*mediaDevice->close)(mediaDevice, fd);
 		else
 		    close(fd);
-		if (mediaDevice->shutdown)
-		    (*mediaDevice->shutdown)(mediaDevice);
-	    } else {
+	    }
+	    else {
 		msgConfirm("Couldn't get root floppy image from %s\n, falling back to floppy.", mediaDevice->name);
 		if (mediaDevice->shutdown)
 		    (*mediaDevice->shutdown)(mediaDevice);
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c
index a51f996..980bc57 100644
--- a/usr.sbin/sysinstall/config.c
+++ b/usr.sbin/sysinstall/config.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: config.c,v 1.12 1995/05/28 20:28:07 jkh Exp $
+ * $Id: config.c,v 1.13 1995/05/29 11:01:06 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -155,7 +155,7 @@ configFstab(void)
 	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)
+		    if (c2->type == part && c2->private)
 			chunk_list[nchunks++] = c2;
 		}
 	    }
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index 75ff6fa..2e3e201 100644
--- a/usr.sbin/sysinstall/dist.c
+++ b/usr.sbin/sysinstall/dist.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: dist.c,v 1.31 1995/05/28 20:28:11 jkh Exp $
+ * $Id: dist.c,v 1.32 1995/05/29 11:01:10 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -314,7 +314,7 @@ distExtract(char *parent, Distribution *me)
 		goto punt;
 	    }
 	    snprintf(prompt, 80, "Extracting %s into %s directory...", me[i].my_name, me[i].my_dir);
-	    dialog_gauge(" Progress ", prompt, 8, 10, 10, 40, (numchunks / (chunk + 1)));
+	    dialog_gauge(" Progress ", prompt, 8, 15, 6, 40, (chunk + 1 ) / numchunks * 100);
 	    while ((n = read(fd, buf, sizeof buf)) > 0) {
 		retval = write(fd2, buf, n);
 		if (retval != n)
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index f501494..24f8a3a 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.66 1995/05/29 00:50:02 jkh Exp $
+ * $Id: install.c,v 1.67 1995/05/29 11:01:23 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -417,9 +417,8 @@ root_extract(void)
 		    (*mediaDevice->close)(mediaDevice, fd);
 		else
 		    close(fd);
-		if (mediaDevice->shutdown)
-		    (*mediaDevice->shutdown)(mediaDevice);
-	    } else {
+	    }
+	    else {
 		msgConfirm("Couldn't get root floppy image from %s\n, falling back to floppy.", mediaDevice->name);
 		if (mediaDevice->shutdown)
 		    (*mediaDevice->shutdown)(mediaDevice);