[src/trunk]: src/usr.sbin/sysinst Fix inverted condition in previous and only...

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

details:   https://anonhg.NetBSD.org/src/rev/f8e7f4df766f
branches:  trunk
changeset: 367679:f8e7f4df766f
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Jun 21 16:08:25 2022 +0000

description:
Fix inverted condition in previous and only apply special handling for
the "all of NetBSD" partition when we have an outer MBR label.
Pointed out by Izumi Tsutsui. Hopefully the last fix needed for PR 56886.

diffstat:

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

diffs (19 lines):

diff -r d18c617382dd -r f8e7f4df766f usr.sbin/sysinst/disklabel.c
--- a/usr.sbin/sysinst/disklabel.c      Tue Jun 21 15:46:10 2022 +0000
+++ b/usr.sbin/sysinst/disklabel.c      Tue Jun 21 16:08:25 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disklabel.c,v 1.47 2022/06/21 15:42:43 martin Exp $    */
+/*     $NetBSD: disklabel.c,v 1.48 2022/06/21 16:08:25 martin Exp $    */
 
 /*
  * Copyright 2018 The NetBSD Foundation, Inc.
@@ -826,7 +826,8 @@
                        parts->l.d_partitions[part].p_offset = info->start;
                        if (part != RAW_PART
 #if RAW_PART == 3
-                               || part == RAW_PART-1
+                               && (part != RAW_PART-1 ||
+                                   parts->dp.parent == NULL)
 #endif
                                                        ) {
                                parts->dp.free_space +=