diff options
| author | sborrill <sborrill@NetBSD.org> | 2020-11-04 13:27:08 +0000 |
|---|---|---|
| committer | sborrill <sborrill@NetBSD.org> | 2020-11-04 13:27:08 +0000 |
| commit | 5eb7312c86a159a8194ad8a0ba6b81bf1ff6be4f (patch) | |
| tree | 40ba659584cf8f4c7fba76899b13eaa24e865d2b /usr.sbin | |
| parent | e1c5418c66b1fb2da333c20db45fc34442987715 (diff) | |
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 (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/sysinst/mbr.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/sysinst/mbr.c b/usr.sbin/sysinst/mbr.c index df47f48775d..40deebadf76 100644 --- a/usr.sbin/sysinst/mbr.c +++ b/usr.sbin/sysinst/mbr.c @@ -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 @@ mbr_init_default_alignments(struct mbr_disk_partitions *parts, uint track) 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; } |
