Remove some suspect sector size calculations which are also the source

of some confusing messages from newfs (just judging by the number of people
who point them out, anyway).

3 files changed, 3 insertions, 30 deletions

diff --git a/release/sysinstall/label.c b/release/sysinstall/label.c
index ac59ee1..8235921 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.50 1996/06/08 09:08:41 jkh Exp $
+ * $Id: label.c,v 1.51 1996/07/09 03:07:51 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -250,14 +250,6 @@ new_part(char *mpoint, Boolean newfs, u_long size)
     ret->newfs = newfs;
     if (!size)
 	    return ret;
-    for (target = size; target; target--) {
-	for (divisor = 4096 ; divisor > 1023; divisor--) {
-	    if (!(target % divisor)) {
-		sprintf(ret->newfs_cmd + strlen(ret->newfs_cmd), " -u %ld",divisor);
-		return ret;
-	    }
-	}
-    }
     return ret;
 }
 
@@ -723,7 +715,6 @@ diskLabel(char *str)
 		if (type != PART_SWAP) {
 		    /* This is needed to tell the newfs -u about the size */
 		    tmp->private_data = new_part(p->mountpoint, p->newfs, tmp->size);
-		    tmp->private_free = safe_free;
 		    safe_free(p);
 		}
 		else
diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c
index ac59ee1..8235921 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.50 1996/06/08 09:08:41 jkh Exp $
+ * $Id: label.c,v 1.51 1996/07/09 03:07:51 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -250,14 +250,6 @@ new_part(char *mpoint, Boolean newfs, u_long size)
     ret->newfs = newfs;
     if (!size)
 	    return ret;
-    for (target = size; target; target--) {
-	for (divisor = 4096 ; divisor > 1023; divisor--) {
-	    if (!(target % divisor)) {
-		sprintf(ret->newfs_cmd + strlen(ret->newfs_cmd), " -u %ld",divisor);
-		return ret;
-	    }
-	}
-    }
     return ret;
 }
 
@@ -723,7 +715,6 @@ diskLabel(char *str)
 		if (type != PART_SWAP) {
 		    /* This is needed to tell the newfs -u about the size */
 		    tmp->private_data = new_part(p->mountpoint, p->newfs, tmp->size);
-		    tmp->private_free = safe_free;
 		    safe_free(p);
 		}
 		else
diff --git a/usr.sbin/sysinstall/label.c b/usr.sbin/sysinstall/label.c
index ac59ee1..8235921 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.50 1996/06/08 09:08:41 jkh Exp $
+ * $Id: label.c,v 1.51 1996/07/09 03:07:51 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -250,14 +250,6 @@ new_part(char *mpoint, Boolean newfs, u_long size)
     ret->newfs = newfs;
     if (!size)
 	    return ret;
-    for (target = size; target; target--) {
-	for (divisor = 4096 ; divisor > 1023; divisor--) {
-	    if (!(target % divisor)) {
-		sprintf(ret->newfs_cmd + strlen(ret->newfs_cmd), " -u %ld",divisor);
-		return ret;
-	    }
-	}
-    }
     return ret;
 }
 
@@ -723,7 +715,6 @@ diskLabel(char *str)
 		if (type != PART_SWAP) {
 		    /* This is needed to tell the newfs -u about the size */
 		    tmp->private_data = new_part(p->mountpoint, p->newfs, tmp->size);
-		    tmp->private_free = safe_free;
 		    safe_free(p);
 		}
 		else