Module Name: src
Committed By: martin
Date: Tue Jan 14 19:28:32 UTC 2020
Modified Files:
src/usr.sbin/sysinst: mbr.c
Log Message:
PR install/54787: when trying to derive proper alignement and first offset
from exisiting partitions, use the first partition offset if it is already
closer to the start of the disk than the prefered alignment - we can not
move existing partitions around.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/usr.sbin/sysinst/mbr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/mbr.c
diff -u src/usr.sbin/sysinst/mbr.c:1.25 src/usr.sbin/sysinst/mbr.c:1.26
--- src/usr.sbin/sysinst/mbr.c:1.25 Thu Jan 9 19:51:49 2020
+++ src/usr.sbin/sysinst/mbr.c Tue Jan 14 19:28:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mbr.c,v 1.25 2020/01/09 19:51:49 martin Exp $ */
+/* $NetBSD: mbr.c,v 1.26 2020/01/14 19:28:31 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -982,9 +982,16 @@ mbr_change_disk_geom(struct disk_partiti
if (!(ptn_0_limit & 2047)) {
/* Partition ends on a 1MB boundary, align to 1MB */
parts->ptn_alignment = 2048;
- if (ptn_0_base <= 2048
- && !(ptn_0_base & (ptn_0_base - 1))) {
- /* ptn_base is a power of 2, use it */
+ if ((ptn_0_base <= 2048
+ && !(ptn_0_base & (ptn_0_base - 1)))
+ || (ptn_0_base < parts->ptn_0_offset)) {
+ /*
+ * If ptn_base is a power of 2, use it.
+ * Also use it if the first partition
+ * already is close to the begining
+ * of the disk and we can't enforce
+ * better alignment.
+ */
parts->ptn_0_offset = ptn_0_base;
}
}
