From b5ca2d7f98350287ce46934228fc97235e9fce39 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <swildner@dragonflybsd.org>
Date: Sun, 28 Sep 2008 15:11:34 +0000
Subject: [PATCH] We no longer specify block and fragment sizes using
 disklabel(8). Make the installer pass them to newfs(8) instead.

---
 .../src/backend/installer/fn_subpart.c         | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_subpart.c b/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_subpart.c
index 3df7acfe72..c56f817879 100644
--- a/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_subpart.c
+++ b/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_subpart.c
@@ -117,7 +117,7 @@ create_subpartitions(struct i_fn_args *a)
 
 	/*
 	 * Take everything from the 'virgin' disklabel up until the
-	 * '8 or 16 partitions' line.
+	 * '16 partitions' line.
 	 */
 	num_partitions = 16;
 	command_add(cmds, "%s%s '$2==\"partitions:\" || cut { cut = 1 } !cut { print $0 }' <%sinstall.disklabel.%s >%sinstall.disklabel",
@@ -127,9 +127,9 @@ create_subpartitions(struct i_fn_args *a)
 	    a->tmp);
 
 	/*
-	 * 8 or 16 partitions:
-	 * #        size   offset    fstype   [fsize bsize bps/cpg]
-	 *   c:  2128833        0    unused        0     0       	# (Cyl.    0 - 2111*)
+	 * 16 partitions:
+	 * #          size     offset    fstype
+	 *   c:   16383969          0    unused	#    7999.985MB
 	 */
 
 #if defined(__FreeBSD__) && !defined(__DragonFly__)
@@ -140,7 +140,7 @@ create_subpartitions(struct i_fn_args *a)
 	    a->os_root, cmd_name(a, "ECHO"), num_partitions ,a->tmp);
 	command_add(cmds, "%s%s '%s' >>%sinstall.disklabel",
 	    a->os_root, cmd_name(a, "ECHO"),
-	    "#        size   offset    fstype   [fsize bsize bps/cpg]",
+	    "#          size     offset    fstype",
 	    a->tmp);
 
 #ifdef DEBUG
@@ -179,13 +179,11 @@ create_subpartitions(struct i_fn_args *a)
 			    capacity_to_string(subpartition_get_capacity(sp)),
 			    a->tmp);
 		} else {
-			command_add(cmds, "%s%s '  %c:\t%s\t%s\t4.2BSD\t%ld\t%ld\t99' >>%sinstall.disklabel",
+			command_add(cmds, "%s%s '  %c:\t%s\t%s\t4.2BSD' >>%sinstall.disklabel",
 			    a->os_root, cmd_name(a, "ECHO"),
 			    subpartition_get_letter(sp),
 			    capacity_to_string(subpartition_get_capacity(sp)),
 			    subpartition_get_letter(sp) == 'a' ? "0" : "*",
-			    subpartition_get_fsize(sp),
-			    subpartition_get_bsize(sp),
 			    a->tmp);
 		}
 	}
@@ -236,9 +234,11 @@ create_subpartitions(struct i_fn_args *a)
 		command_add_ensure_dev(a, cmds,
 		    subpartition_get_device_name(sp));
 
-		command_add(cmds, "%s%s%s %sdev/%s",
+		command_add(cmds, "%s%s%s -b %ld -f %ld %sdev/%s",
 		    a->os_root, cmd_name(a, "NEWFS"),
 		    subpartition_is_softupdated(sp) ? " -U" : "",
+		    subpartition_get_bsize(sp),
+		    subpartition_get_fsize(sp),
 		    a->os_root,
 		    subpartition_get_device_name(sp));
 	}
-- 
2.41.0