[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/5712b0dd2e0d
branches:  netbsd-9
changeset: 962740:5712b0dd2e0d
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Aug 02 05:43:20 2019 +0000

description:
Pull up following revision(s) (requested by martin in ticket #5):
        usr.sbin/sysinst/bsddisklabel.c: revision 1.24
        usr.sbin/sysinst/bsddisklabel.c: revision 1.25
PR 54423: fix handling of user defined partitions
PR 54423: complete initialization of install info for user defined partitions

diffstat:

 usr.sbin/sysinst/bsddisklabel.c |  40 +++++++++++++++++++++++-----------------
 1 files changed, 23 insertions(+), 17 deletions(-)

diffs (63 lines):

diff -r 7666be175cb5 -r 5712b0dd2e0d usr.sbin/sysinst/bsddisklabel.c
--- a/usr.sbin/sysinst/bsddisklabel.c   Fri Aug 02 05:41:46 2019 +0000
+++ b/usr.sbin/sysinst/bsddisklabel.c   Fri Aug 02 05:43:20 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bsddisklabel.c,v 1.23 2019/07/28 16:30:36 martin Exp $ */
+/*     $NetBSD: bsddisklabel.c,v 1.23.2.1 2019/08/02 05:43:20 msaitoh Exp $    */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -365,24 +365,25 @@
                        /* we need absolute mount paths */
                        memmove(new_mp+1, new_mp, sizeof(new_mp)-1);
                        new_mp[0] = '/';
-                       /* duplicates? */
-                       bool duplicate = false;
-                       for (size_t i = 0; i < pset->num; i++) {
-                               if (strcmp(pset->infos[i].mount,
-                                   new_mp) == 0) {
-                                       args = new_mp;
-                                       err = str_arg_subst(
-                                           msg_string(MSG_mp_already_exists),
-                                           1, &args);
-                                       err_msg_win(err);
-                                       free(err);
-                                       duplicate = true;
-                                       break;
-                               }
+               }
+
+               /* duplicates? */
+               bool duplicate = false;
+               for (size_t i = 0; i < pset->num; i++) {
+                       if (strcmp(pset->infos[i].mount,
+                           new_mp) == 0) {
+                               args = new_mp;
+                               err = str_arg_subst(
+                                   msg_string(MSG_mp_already_exists),
+                                   1, &args);
+                               err_msg_win(err);
+                               free(err);
+                               duplicate = true;
+                               break;
                        }
-                       if (!duplicate)
-                               break;
                }
+               if (!duplicate)
+                       break;
        }
 
        m = realloc(pset->menu_opts, (pset->num+4)*sizeof(*pset->menu_opts));
@@ -400,6 +401,11 @@
        p += pset->num;
        memset(m, 0, sizeof(*m));
        memset(p, 0, sizeof(*p));
+       p->parts = pset->parts;
+       p->cur_part_id = NO_PART;
+       p->type = PT_root;
+       p->fs_type = FS_BSDFFS;
+       p->fs_version = 2;
        strncpy(p->mount, new_mp, sizeof(p->mount));
 
        menu->cursel = pset->num;