[src/trunk]: src/usr.sbin/sysinst When we are going to create (and populate) ...

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

details:   https://anonhg.NetBSD.org/src/rev/6f0d6c7499ef
branches:  trunk
changeset: 962266:6f0d6c7499ef
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Jul 09 16:25:05 2019 +0000

description:
When we are going to create (and populate) a new boot partition, we should
newfs and mount it.

Fix arguments to the MD_PART_DEFAULTS macro and invoke it a bit earlier
(before we shift things around).

diffstat:

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

diffs (41 lines):

diff -r abc9c1a4293e -r 6f0d6c7499ef usr.sbin/sysinst/bsddisklabel.c
--- a/usr.sbin/sysinst/bsddisklabel.c   Tue Jul 09 16:24:01 2019 +0000
+++ b/usr.sbin/sysinst/bsddisklabel.c   Tue Jul 09 16:25:05 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bsddisklabel.c,v 1.17 2019/07/09 16:21:52 martin Exp $ */
+/*     $NetBSD: bsddisklabel.c,v 1.18 2019/07/09 16:25:05 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -72,7 +72,7 @@
          .mount = PART_BOOT_MOUNT,
          .instflags = PUIINST_MOUNT|PUIINST_BOOT,
 #else
-         .instflags = PUIINST_MOUNT|PUIINST_BOOT,
+         .instflags = PUIINST_BOOT,
 #endif
 #ifdef PART_BOOT_TYPE
          .fs_type = PART_BOOT_TYPE,
@@ -996,6 +996,11 @@
        }
 
        memcpy(wanted->infos, default_parts_init, sizeof(default_parts_init));
+
+#ifdef MD_PART_DEFAULTS
+       MD_PART_DEFAULTS(pm, wanted->infos, wanted->num);
+#endif
+
        for (i = 0; i < wanted->num; i++) {
                wanted->infos[i].parts = parts;
                wanted->infos[i].cur_part_id = NO_PART;
@@ -1035,10 +1040,6 @@
                            get_ramsize() * (MEG/512/4);
        }
 
-#ifdef MD_PART_DEFAULTS
-       MD_PART_DEFAULTS(pm, wanted->infos[i].parts, wanted->num);
-#endif
-
        /*
         * Now we have the defaults as if we were installing to an
         * empty disk. Merge the partitions in target range that are already