[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/f4079f75168a
branches:  netbsd-9
changeset: 963162:f4079f75168a
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Oct 23 06:04:44 2019 +0000

description:
Pull up following revision(s) (requested by martin in ticket #365):
        usr.sbin/sysinst/bsddisklabel.c: revision 1.28
        usr.sbin/sysinst/disks.c: revision 1.53
Skip unwanted (zero sized) partitions.

diffstat:

 usr.sbin/sysinst/bsddisklabel.c |  4 +++-
 usr.sbin/sysinst/disks.c        |  5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diffs (37 lines):

diff -r 020a4694523a -r f4079f75168a usr.sbin/sysinst/bsddisklabel.c
--- a/usr.sbin/sysinst/bsddisklabel.c   Wed Oct 23 06:03:24 2019 +0000
+++ b/usr.sbin/sysinst/bsddisklabel.c   Wed Oct 23 06:04:44 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bsddisklabel.c,v 1.23.2.3 2019/08/29 06:46:13 msaitoh Exp $    */
+/*     $NetBSD: bsddisklabel.c,v 1.23.2.4 2019/10/23 06:04:44 msaitoh Exp $    */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -1278,6 +1278,8 @@
                for (i = 0; i < wanted->num; i++) {
                        if (wanted->infos[i].cur_part_id != NO_PART)
                                continue;
+                       if (wanted->infos[i].size <= 0)
+                               continue;
                        if (t.start == infos[i].start) {
                                wanted->infos[i].cur_part_id = pno;
                                wanted->infos[i].cur_start = infos[i].start;
diff -r 020a4694523a -r f4079f75168a usr.sbin/sysinst/disks.c
--- a/usr.sbin/sysinst/disks.c  Wed Oct 23 06:03:24 2019 +0000
+++ b/usr.sbin/sysinst/disks.c  Wed Oct 23 06:04:44 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disks.c,v 1.44.2.7 2019/10/23 05:58:13 msaitoh Exp $ */
+/*     $NetBSD: disks.c,v 1.44.2.8 2019/10/23 06:04:44 msaitoh Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -1290,6 +1290,9 @@
 
                const struct part_usage_info *ptn = &install->infos[i];
 
+               if (ptn->size == 0)
+                       continue;
+
                if (ptn->type != PT_swap &&
                    (ptn->instflags & PUIINST_MOUNT) == 0)
                        continue;