Module Name: src Committed By: martin Date: Thu Aug 1 17:50:16 UTC 2019
Modified Files: src/usr.sbin/sysinst: bsddisklabel.c Log Message: 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.25 -r1.26 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.25 src/usr.sbin/sysinst/bsddisklabel.c:1.26 --- src/usr.sbin/sysinst/bsddisklabel.c:1.25 Thu Aug 1 17:49:12 2019 +++ src/usr.sbin/sysinst/bsddisklabel.c Thu Aug 1 17:50:16 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: bsddisklabel.c,v 1.25 2019/08/01 17:49:12 martin Exp $ */ +/* $NetBSD: bsddisklabel.c,v 1.26 2019/08/01 17:50:16 martin 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 */