[src/trunk]: src/usr.sbin/sysinst Do not assum a partitioning scheme that sup...

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

details:   https://anonhg.NetBSD.org/src/rev/9bf9c308f2d7
branches:  trunk
changeset: 744564:9bf9c308f2d7
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Feb 06 15:08:04 2020 +0000

description:
Do not assum a partitioning scheme that supports innner partitions always
needs to actually have such partitions defined.

diffstat:

 usr.sbin/sysinst/target.c |  13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diffs (42 lines):

diff -r 0e642d3ba4e9 -r 9bf9c308f2d7 usr.sbin/sysinst/target.c
--- a/usr.sbin/sysinst/target.c Thu Feb 06 13:31:30 2020 +0000
+++ b/usr.sbin/sysinst/target.c Thu Feb 06 15:08:04 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: target.c,v 1.11 2020/01/09 13:22:30 martin Exp $       */
+/*     $NetBSD: target.c,v 1.12 2020/02/06 15:08:04 martin Exp $       */
 
 /*
  * Copyright 1997 Jonathan Stone
@@ -71,7 +71,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: target.c,v 1.11 2020/01/09 13:22:30 martin Exp $");
+__RCSID("$NetBSD: target.c,v 1.12 2020/02/06 15:08:04 martin Exp $");
 #endif
 
 /*
@@ -157,7 +157,7 @@
        static struct pm_devs *last_pm;
        static int last_res;
        part_id ptn;
-       struct disk_partitions *parts;
+       struct disk_partitions *parts, *inner;
        struct disk_part_info info;
 
        if (pm == last_pm)
@@ -180,9 +180,12 @@
                return last_res;
        }
 
-       if (pm->parts->pscheme->secondary_partitions != NULL)
-               parts = pm->parts->pscheme->secondary_partitions(parts,
+       if (pm->parts->pscheme->secondary_partitions != NULL) {
+               inner = pm->parts->pscheme->secondary_partitions(parts,
                    pm->ptstart, false);
+               if (inner != NULL)
+                       parts = inner;
+       }
 
        for (ptn = 0; ptn < parts->num_part; ptn++) {
                if (!parts->pscheme->get_part_info(parts, ptn, &info))