Module Name: src
Committed By: bouyer
Date: Tue Nov 13 17:22:04 UTC 2018
Modified Files:
src/usr.sbin/sysinst: disks.c
Log Message:
Skip mbr for xbd and raid devices, as it was before Nov. 5 commits.
anita xen installs should work again.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/usr.sbin/sysinst/disks.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/disks.c
diff -u src/usr.sbin/sysinst/disks.c:1.25 src/usr.sbin/sysinst/disks.c:1.26
--- src/usr.sbin/sysinst/disks.c:1.25 Sun Nov 11 10:06:09 2018
+++ src/usr.sbin/sysinst/disks.c Tue Nov 13 17:22:04 2018
@@ -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 @@ get_disks_helper(void *arg, const char *
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;
