[src/netbsd-9]: src/usr.sbin/sysinst Pull up the following revisions(s) (requ...

[sborrill <sborrill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4638e3962399
branches:  netbsd-9
changeset: 942048:4638e3962399
user:      sborrill <sborrill%NetBSD.org@localhost>
date:      Wed Nov 04 13:27:08 2020 +0000

description:
Pull up the following revisions(s) (requested by martin in ticket #1119):
        usr.sbin/sysinst/mbr.c: revision 1.37

Do not force alignment of the first partition by default (which is
treated special to skip the first track), unless an existing partition
table hints at it.

diffstat:

 usr.sbin/sysinst/mbr.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r 8186e3805c1d -r 4638e3962399 usr.sbin/sysinst/mbr.c
--- a/usr.sbin/sysinst/mbr.c    Wed Nov 04 11:49:55 2020 +0000
+++ b/usr.sbin/sysinst/mbr.c    Wed Nov 04 13:27:08 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mbr.c,v 1.19.2.7 2020/10/15 19:36:51 bouyer Exp $ */
+/*     $NetBSD: mbr.c,v 1.19.2.8 2020/11/04 13:27:08 sborrill Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -889,16 +889,15 @@
        if (parts->dp.disk_size < 0)
                return;
 
+       parts->ptn_0_offset = parts->geo_sec;
+
        /* Use 1MB offset/alignemnt for large (>128GB) disks */
        if (parts->dp.disk_size > HUGE_DISK_SIZE) {
                parts->ptn_alignment = 2048;
-               parts->ptn_0_offset = 2048;
        } else if (parts->dp.disk_size > TINY_DISK_SIZE) {
                parts->ptn_alignment = 64;
-               parts->ptn_0_offset = parts->geo_sec;
        } else {
                parts->ptn_alignment = 1;
-               parts->ptn_0_offset = parts->geo_sec;
        }
        parts->ext_ptn_alignment = track;
 }