Module Name: src
Committed By: martin
Date: Fri Oct 25 12:24:34 UTC 2019
Modified Files:
src/usr.sbin/sysinst: bsddisklabel.c part_edit.c
Log Message:
Honor the "no_mbr" flag (used especially for raid and xbd devices)
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/usr.sbin/sysinst/bsddisklabel.c
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/part_edit.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/bsddisklabel.c
diff -u src/usr.sbin/sysinst/bsddisklabel.c:1.28 src/usr.sbin/sysinst/bsddisklabel.c:1.29
--- src/usr.sbin/sysinst/bsddisklabel.c:1.28 Mon Oct 21 16:10:54 2019
+++ src/usr.sbin/sysinst/bsddisklabel.c Fri Oct 25 12:24:34 2019
@@ -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 @@ make_bsd_partitions(struct install_parti
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,
Index: src/usr.sbin/sysinst/part_edit.c
diff -u src/usr.sbin/sysinst/part_edit.c:1.8 src/usr.sbin/sysinst/part_edit.c:1.9
--- src/usr.sbin/sysinst/part_edit.c:1.8 Thu Oct 24 18:17:08 2019
+++ src/usr.sbin/sysinst/part_edit.c Fri Oct 25 12:24:34 2019
@@ -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 @@ select_part_scheme(
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];
