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

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

details:   https://anonhg.NetBSD.org/src/rev/f5b124c10438
branches:  netbsd-10
changeset: 372860:f5b124c10438
user:      snj <snj%NetBSD.org@localhost>
date:      Sat Dec 31 04:55:12 2022 +0000

description:
Pull up following revision(s) (requested by martin in ticket #30):
        usr.sbin/sysinst/bsddisklabel.c: revision 1.71
PR 57132: when calculation additional space available for the "expanded"
partition (typically /) do not forget the reserved space (that might
be required for the system/bootloader/other MD stuff).

diffstat:

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

diffs (19 lines):

diff -r cf58c6284788 -r f5b124c10438 usr.sbin/sysinst/bsddisklabel.c
--- a/usr.sbin/sysinst/bsddisklabel.c   Thu Dec 29 09:40:26 2022 +0000
+++ b/usr.sbin/sysinst/bsddisklabel.c   Sat Dec 31 04:55:12 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bsddisklabel.c,v 1.69 2022/12/15 15:32:04 martin Exp $ */
+/*     $NetBSD: bsddisklabel.c,v 1.69.2.1 2022/12/31 04:55:12 snj Exp $        */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -1434,7 +1434,8 @@
         * but check size limits.
         */
        if (exp_ndx < wanted->num) {
-               daddr_t free_space = parts->free_space - planned_space;
+               daddr_t free_space = parts->free_space - planned_space -
+                   wanted->reserved_space;
                daddr_t new_size = wanted->infos[exp_ndx].size;
                if (free_space > 0)
                        new_size += roundup(free_space,align);