[src/trunk]: src/usr.sbin/sysinst Skip mbr for xbd and raid devices, as it wa...

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

details:   https://anonhg.NetBSD.org/src/rev/c262ead73481
branches:  trunk
changeset: 994562:c262ead73481
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Tue Nov 13 17:22:04 2018 +0000

description:
Skip mbr for xbd and raid devices, as it was before Nov. 5 commits.
anita xen installs should work again.

diffstat:

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

diffs (21 lines):

diff -r b588c7983f75 -r c262ead73481 usr.sbin/sysinst/disks.c
--- a/usr.sbin/sysinst/disks.c  Tue Nov 13 14:52:30 2018 +0000
+++ b/usr.sbin/sysinst/disks.c  Tue Nov 13 17:22:04 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disks.c,v 1.25 2018/11/11 10:06:09 martin Exp $ */
+/*     $NetBSD: disks.c,v 1.26 2018/11/13 17:22:04 bouyer Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -620,6 +620,11 @@
        if (state->dd->dd_no_part && !state->with_non_partitionable)
                return true;
 
+       if (strncmp(dev, "xbd", 3) == 0 || strncmp(dev, "raid", 4) == 0) {
+               /* if this device is xbd or raid, don't set up an MBR */
+               state->dd->dd_no_mbr = true;
+       }
+
        if (!get_geom(state->dd->dd_name, &l)) {
                if (errno == ENOENT)
                        return true;