[src/trunk]: src/usr.sbin/sysinst/arch PR install/54921: skip non-user partit...

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

details:   https://anonhg.NetBSD.org/src/rev/5c8c4e399c59
branches:  trunk
changeset: 744487:5c8c4e399c59
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Feb 03 13:09:29 2020 +0000

description:
PR install/54921: skip non-user partitions when checking for overlaps

diffstat:

 usr.sbin/sysinst/arch/hp300/md.c   |  8 +++++++-
 usr.sbin/sysinst/arch/mvme68k/md.c |  8 +++++++-
 usr.sbin/sysinst/arch/x68k/md.c    |  8 +++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diffs (66 lines):

diff -r 9164087cdcbf -r 5c8c4e399c59 usr.sbin/sysinst/arch/hp300/md.c
--- a/usr.sbin/sysinst/arch/hp300/md.c  Mon Feb 03 12:56:26 2020 +0000
+++ b/usr.sbin/sysinst/arch/hp300/md.c  Mon Feb 03 13:09:29 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.9 2019/12/15 13:39:24 martin Exp $ */
+/*     $NetBSD: md.c,v 1.10 2020/02/03 13:09:29 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -136,6 +136,12 @@
 
        for (i = 0; i < install->num; i++) {
                if (i > 0) {
+                       /* skip raw part and similar */
+                       if (install->infos[i].cur_flags &
+                           (PTI_SEC_CONTAINER|PTI_PSCHEME_INTERNAL|
+                           PTI_RAW_PART))
+                               continue;
+
                        if (install->infos[i].cur_start < last_end) {
                                snprintf(desc, sizeof desc,
                                    "%zu (%s)", i,
diff -r 9164087cdcbf -r 5c8c4e399c59 usr.sbin/sysinst/arch/mvme68k/md.c
--- a/usr.sbin/sysinst/arch/mvme68k/md.c        Mon Feb 03 12:56:26 2020 +0000
+++ b/usr.sbin/sysinst/arch/mvme68k/md.c        Mon Feb 03 13:09:29 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.9 2019/12/15 13:39:24 martin Exp $    */
+/*     $NetBSD: md.c,v 1.10 2020/02/03 13:09:29 martin Exp $   */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -136,6 +136,12 @@
 
        for (i = 0; i < install->num; i++) {
                if (i > 0) {
+                       /* skip raw part and similar */
+                       if (install->infos[i].cur_flags &
+                           (PTI_SEC_CONTAINER|PTI_PSCHEME_INTERNAL|
+                           PTI_RAW_PART))
+                               continue;
+
                        if (install->infos[i].cur_start < last_end) {
                                snprintf(desc, sizeof desc,
                                    "%zu (%s)", i,
diff -r 9164087cdcbf -r 5c8c4e399c59 usr.sbin/sysinst/arch/x68k/md.c
--- a/usr.sbin/sysinst/arch/x68k/md.c   Mon Feb 03 12:56:26 2020 +0000
+++ b/usr.sbin/sysinst/arch/x68k/md.c   Mon Feb 03 13:09:29 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.9 2019/12/15 13:39:24 martin Exp $ */
+/*     $NetBSD: md.c,v 1.10 2020/02/03 13:09:29 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -164,6 +164,12 @@
 
        for (i = 0; i < install->num; i++) {
                if (i > 0) {
+                       /* skip raw part and similar */
+                       if (install->infos[i].cur_flags &
+                           (PTI_SEC_CONTAINER|PTI_PSCHEME_INTERNAL|
+                           PTI_RAW_PART))
+                               continue;
+
                        if (install->infos[i].cur_start < last_end) {
                                snprintf(desc, sizeof desc,
                                    "%zu (%s)", i,