[src/netbsd-9]: src/usr.sbin/sysinst Pull up following revision(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/7b5e1752417c
branches:  netbsd-9
changeset: 458116:7b5e1752417c
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Aug 02 05:45:54 2019 +0000

description:
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.

diffstat:

 usr.sbin/sysinst/bsddisklabel.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (23 lines):

diff -r 5eac468bb163 -r 7b5e1752417c usr.sbin/sysinst/bsddisklabel.c
--- a/usr.sbin/sysinst/bsddisklabel.c   Fri Aug 02 05:43:20 2019 +0000
+++ b/usr.sbin/sysinst/bsddisklabel.c   Fri Aug 02 05:45:54 2019 +0000
@@ -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 @@
                        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 */