[src/trunk]: src/usr.sbin/sysinst When trying to tell a fictious but empty la...

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

details:   https://anonhg.NetBSD.org/src/rev/897fd425e9b6
branches:  trunk
changeset: 847168:897fd425e9b6
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Dec 13 21:46:59 2019 +0000

description:
When trying to tell a fictious but empty label from a real one, skip
partition a if it has the same start and size as the raw partition.

diffstat:

 usr.sbin/sysinst/disklabel.c |  8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diffs (22 lines):

diff -r 40bf5d32e314 -r 897fd425e9b6 usr.sbin/sysinst/disklabel.c
--- a/usr.sbin/sysinst/disklabel.c      Fri Dec 13 20:50:08 2019 +0000
+++ b/usr.sbin/sysinst/disklabel.c      Fri Dec 13 21:46:59 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disklabel.c,v 1.21 2019/12/12 20:14:21 martin Exp $    */
+/*     $NetBSD: disklabel.c,v 1.22 2019/12/13 21:46:59 martin Exp $    */
 
 /*
  * Copyright 2018 The NetBSD Foundation, Inc.
@@ -278,6 +278,12 @@
                for (int part = 0; part < parts->l.d_npartitions; part++) {
                        if (parts->l.d_partitions[part].p_fstype == FS_UNUSED)
                                continue;
+                       if (part == 0 &&
+                           parts->l.d_partitions[part].p_offset ==
+                            parts->l.d_partitions[RAW_PART].p_offset &&
+                           parts->l.d_partitions[part].p_size ==
+                            parts->l.d_partitions[RAW_PART].p_size)
+                               continue;
                        if (part == RAW_PART)
                                continue;
                        found_real_part = true;