[src/trunk]: src/usr.sbin/sysinst When reading the secondary disklabel partit...

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

details:   https://anonhg.NetBSD.org/src/rev/2d9c2fa85449
branches:  trunk
changeset: 968281:2d9c2fa85449
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Jan 09 19:51:49 2020 +0000

description:
When reading the secondary disklabel partitions from an existing disklabel
set the mbr partitions as parent.

diffstat:

 usr.sbin/sysinst/mbr.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r bd18951f2621 -r 2d9c2fa85449 usr.sbin/sysinst/mbr.c
--- a/usr.sbin/sysinst/mbr.c    Thu Jan 09 19:17:40 2020 +0000
+++ b/usr.sbin/sysinst/mbr.c    Thu Jan 09 19:51:49 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mbr.c,v 1.24 2020/01/09 13:22:30 martin Exp $ */
+/*     $NetBSD: mbr.c,v 1.25 2020/01/09 19:51:49 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -1743,10 +1743,13 @@
                                return NULL;
                }
 
-               if (!force_empty)
+               if (!force_empty) {
                        myparts->dlabel = disklabel_parts.read_from_disk(
                            myparts->dp.disk, part.start, part.size,
                            &disklabel_parts);
+                       if (myparts->dlabel != NULL)
+                               myparts->dlabel->parent = &myparts->dp;
+               }
 
                if (myparts->dlabel == NULL && part.size > 0) {
                        /* we just created the outer partitions? */