[src/trunk]: src/usr.sbin/sysinst Honor the "no_mbr" flag (used especially fo...

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

details:   https://anonhg.NetBSD.org/src/rev/b3117d19621c
branches:  trunk
changeset: 460495:b3117d19621c
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Oct 25 12:24:34 2019 +0000

description:
Honor the "no_mbr" flag (used especially for raid and xbd devices)

diffstat:

 usr.sbin/sysinst/bsddisklabel.c |  4 ++--
 usr.sbin/sysinst/part_edit.c    |  4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (36 lines):

diff -r 610de6f3f936 -r b3117d19621c usr.sbin/sysinst/bsddisklabel.c
--- a/usr.sbin/sysinst/bsddisklabel.c   Fri Oct 25 09:09:24 2019 +0000
+++ b/usr.sbin/sysinst/bsddisklabel.c   Fri Oct 25 12:24:34 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bsddisklabel.c,v 1.28 2019/10/21 16:10:54 martin Exp $ */
+/*     $NetBSD: bsddisklabel.c,v 1.29 2019/10/25 12:24:34 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -1341,7 +1341,7 @@
                return true;
 
        if (parts == NULL) {
-               pscheme = select_part_scheme(pm, NULL, true, NULL);
+               pscheme = select_part_scheme(pm, NULL, !pm->no_mbr, NULL);
                if (pscheme == NULL)
                        return false;
                parts = pscheme->create_new_for_disk(pm->diskdev,
diff -r 610de6f3f936 -r b3117d19621c usr.sbin/sysinst/part_edit.c
--- a/usr.sbin/sysinst/part_edit.c      Fri Oct 25 09:09:24 2019 +0000
+++ b/usr.sbin/sysinst/part_edit.c      Fri Oct 25 12:24:34 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: part_edit.c,v 1.8 2019/10/24 18:17:08 martin Exp $ */
+/*     $NetBSD: part_edit.c,v 1.9 2019/10/25 12:24:34 martin Exp $ */
 
 /*
  * Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -1218,6 +1218,8 @@
                if (bootable && p->have_boot_support != NULL &&
                    !p->have_boot_support(dev->diskdev))
                        continue;
+               if (dev->no_mbr && p->name == MSG_parttype_mbr)
+                       continue;
                if (p->size_limit && dev->dlsize > p->size_limit) {
                        char buf[255], hum_lim[5];