[src/trunk]: src/usr.sbin/sysinst Minor tweak to previous: when forcing a /us...

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

details:   https://anonhg.NetBSD.org/src/rev/0657c5a1fd62
branches:  trunk
changeset: 932603:0657c5a1fd62
user:      martin <martin%NetBSD.org@localhost>
date:      Tue May 12 06:23:07 2020 +0000

description:
Minor tweak to previous: when forcing a /usr partition just to have an
arbitrary extendable partition, still use its default size initially.

diffstat:

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

diffs (19 lines):

diff -r b8da841bed3e -r 0657c5a1fd62 usr.sbin/sysinst/bsddisklabel.c
--- a/usr.sbin/sysinst/bsddisklabel.c   Mon May 11 23:47:45 2020 +0000
+++ b/usr.sbin/sysinst/bsddisklabel.c   Tue May 12 06:23:07 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bsddisklabel.c,v 1.41 2020/05/11 17:40:50 martin Exp $ */
+/*     $NetBSD: bsddisklabel.c,v 1.42 2020/05/12 06:23:07 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -1147,7 +1147,8 @@
                        wanted->infos[usr].size = wanted->infos[root].size
                            - wanted->infos[root].limit;
                        if (wanted->infos[usr].size <= 0)
-                               wanted->infos[usr].size = 1;
+                               wanted->infos[usr].size = max(1,
+                                   wanted->infos[usr].def_size);
                        wanted->infos[root].size =
                            wanted->infos[root].limit;
                        if (wanted->infos[root].flags & PUIFLAG_EXTEND) {