Module Name: src
Committed By: martin
Date: Sat Oct 26 07:32:52 UTC 2019
Modified Files:
src/usr.sbin/sysinst: part_edit.c partitions.c
Log Message:
In non-MBR specific files, #ifdef all tests for MBR for architectures
that do not even compile in MBR support.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/part_edit.c
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/partitions.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/part_edit.c
diff -u src/usr.sbin/sysinst/part_edit.c:1.9 src/usr.sbin/sysinst/part_edit.c:1.10
--- src/usr.sbin/sysinst/part_edit.c:1.9 Fri Oct 25 12:24:34 2019
+++ src/usr.sbin/sysinst/part_edit.c Sat Oct 26 07:32:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: part_edit.c,v 1.9 2019/10/25 12:24:34 martin Exp $ */
+/* $NetBSD: part_edit.c,v 1.10 2019/10/26 07:32:52 martin Exp $ */
/*
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -1218,8 +1218,10 @@ select_part_scheme(
if (bootable && p->have_boot_support != NULL &&
!p->have_boot_support(dev->diskdev))
continue;
+#ifdef HAVE_MBR
if (dev->no_mbr && p->name == MSG_parttype_mbr)
continue;
+#endif
if (p->size_limit && dev->dlsize > p->size_limit) {
char buf[255], hum_lim[5];
Index: src/usr.sbin/sysinst/partitions.c
diff -u src/usr.sbin/sysinst/partitions.c:1.3 src/usr.sbin/sysinst/partitions.c:1.4
--- src/usr.sbin/sysinst/partitions.c:1.3 Fri Oct 25 12:49:58 2019
+++ src/usr.sbin/sysinst/partitions.c Sat Oct 26 07:32:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: partitions.c,v 1.3 2019/10/25 12:49:58 martin Exp $ */
+/* $NetBSD: partitions.c,v 1.4 2019/10/26 07:32:52 martin Exp $ */
/*
* Copyright 2018 The NetBSD Foundation, Inc.
@@ -53,8 +53,10 @@ partitions_read_disk(const char *dev, da
return NULL;
for (ps = available_part_schemes; *ps; ps++) {
+#ifdef HAVE_MBR
if (no_mbr && (*ps)->name == MSG_parttype_mbr)
continue;
+#endif
struct disk_partitions *parts =
(*ps)->read_from_disk(dev, 0, disk_size, *ps);
if (parts)
