Module Name: src
Committed By: martin
Date: Mon Feb 3 13:09:29 UTC 2020
Modified Files:
src/usr.sbin/sysinst/arch/hp300: md.c
src/usr.sbin/sysinst/arch/mvme68k: md.c
src/usr.sbin/sysinst/arch/x68k: md.c
Log Message:
PR install/54921: skip non-user partitions when checking for overlaps
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/arch/hp300/md.c
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/arch/mvme68k/md.c
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/arch/x68k/md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/arch/hp300/md.c
diff -u src/usr.sbin/sysinst/arch/hp300/md.c:1.9 src/usr.sbin/sysinst/arch/hp300/md.c:1.10
--- src/usr.sbin/sysinst/arch/hp300/md.c:1.9 Sun Dec 15 13:39:24 2019
+++ src/usr.sbin/sysinst/arch/hp300/md.c Mon Feb 3 13:09:29 2020
@@ -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 @@ md_check_partitions(struct install_parti
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,
Index: src/usr.sbin/sysinst/arch/mvme68k/md.c
diff -u src/usr.sbin/sysinst/arch/mvme68k/md.c:1.9 src/usr.sbin/sysinst/arch/mvme68k/md.c:1.10
--- src/usr.sbin/sysinst/arch/mvme68k/md.c:1.9 Sun Dec 15 13:39:24 2019
+++ src/usr.sbin/sysinst/arch/mvme68k/md.c Mon Feb 3 13:09:29 2020
@@ -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 @@ md_check_partitions(struct install_parti
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,
Index: src/usr.sbin/sysinst/arch/x68k/md.c
diff -u src/usr.sbin/sysinst/arch/x68k/md.c:1.9 src/usr.sbin/sysinst/arch/x68k/md.c:1.10
--- src/usr.sbin/sysinst/arch/x68k/md.c:1.9 Sun Dec 15 13:39:24 2019
+++ src/usr.sbin/sysinst/arch/x68k/md.c Mon Feb 3 13:09:29 2020
@@ -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 @@ md_check_partitions(struct install_parti
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,
