[src/trunk]: src/usr.sbin/sysinst When checking for existing NetBSD partition...

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

details:   https://anonhg.NetBSD.org/src/rev/94a8f1328548
branches:  trunk
changeset: 962264:94a8f1328548
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Jul 09 16:21:52 2019 +0000

description:
When checking for existing NetBSD partitions skip extended MBR and disklabel
raw partitions.

diffstat:

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

diffs (31 lines):

diff -r 870c973db482 -r 94a8f1328548 usr.sbin/sysinst/bsddisklabel.c
--- a/usr.sbin/sysinst/bsddisklabel.c   Tue Jul 09 16:16:33 2019 +0000
+++ b/usr.sbin/sysinst/bsddisklabel.c   Tue Jul 09 16:21:52 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bsddisklabel.c,v 1.16 2019/06/22 20:46:07 christos Exp $       */
+/*     $NetBSD: bsddisklabel.c,v 1.17 2019/07/09 16:21:52 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -829,7 +829,6 @@
  * Check if there is a reasonable pre-existing partition for
  * NetBSD.
  */
-
 static bool
 check_existing_netbsd(struct disk_partitions *parts)
 {
@@ -838,8 +837,11 @@
 
        nbsd_parts = 0;
        for (part_id p = 0; p < parts->num_part; p++) {
-               if (parts->pscheme->get_part_info(parts, p, &info) &&
-                   info.nat_type && info.nat_type->generic_ptype == PT_root)
+               if (!parts->pscheme->get_part_info(parts, p, &info))
+                       continue;
+               if (info.flags & (PTI_PSCHEME_INTERNAL|PTI_RAW_PART))
+                       continue;
+               if (info.nat_type && info.nat_type->generic_ptype == PT_root)
                        nbsd_parts++;
        }