Module Name: src
Committed By: msaitoh
Date: Fri Aug 2 05:45:54 UTC 2019
Modified Files:
src/usr.sbin/sysinst [netbsd-9]: bsddisklabel.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #6):
usr.sbin/sysinst/bsddisklabel.c: revision 1.26
If we can not fit a planned partition, retry with a bit more slope
in size.
To generate a diff of this commit:
cvs rdiff -u -r1.23.2.1 -r1.23.2.2 src/usr.sbin/sysinst/bsddisklabel.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/bsddisklabel.c
diff -u src/usr.sbin/sysinst/bsddisklabel.c:1.23.2.1 src/usr.sbin/sysinst/bsddisklabel.c:1.23.2.2
--- src/usr.sbin/sysinst/bsddisklabel.c:1.23.2.1 Fri Aug 2 05:43:20 2019
+++ src/usr.sbin/sysinst/bsddisklabel.c Fri Aug 2 05:45:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bsddisklabel.c,v 1.23.2.1 2019/08/02 05:43:20 msaitoh Exp $ */
+/* $NetBSD: bsddisklabel.c,v 1.23.2.2 2019/08/02 05:45:54 msaitoh Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1424,8 +1424,12 @@ apply_settings_to_partitions(struct pm_d
continue;
size_t cnt = wanted->parts->pscheme->get_free_spaces(
- wanted->parts, &space, 1, want->size-2*align, align, from,
+ wanted->parts, &space, 1, want->size-align, align, from,
-1);
+ if (cnt == 0)
+ cnt = wanted->parts->pscheme->get_free_spaces(
+ wanted->parts, &space, 1,
+ want->size-5*align, align, from, -1);
if (cnt == 0)
continue; /* no free space for this partition */
