Module Name: src
Committed By: martin
Date: Tue Jan 21 20:04:30 UTC 2020
Modified Files:
src/usr.sbin/sysinst: disklabel.c
Log Message:
Deal with even stranger fictious empty disklabels (PR kern/54882).
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/usr.sbin/sysinst/disklabel.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/disklabel.c
diff -u src/usr.sbin/sysinst/disklabel.c:1.32 src/usr.sbin/sysinst/disklabel.c:1.33
--- src/usr.sbin/sysinst/disklabel.c:1.32 Tue Jan 21 06:44:40 2020
+++ src/usr.sbin/sysinst/disklabel.c Tue Jan 21 20:04:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.c,v 1.32 2020/01/21 06:44:40 mrg Exp $ */
+/* $NetBSD: disklabel.c,v 1.33 2020/01/21 20:04:30 martin Exp $ */
/*
* Copyright 2018 The NetBSD Foundation, Inc.
@@ -302,7 +302,7 @@ disklabel_parts_read(const char *disk, d
for (int part = 0; part < parts->l.d_npartitions; part++) {
if (parts->l.d_partitions[part].p_fstype == FS_UNUSED)
continue;
- if (part == 0 &&
+ if (/* part == 0 && */ /* PR kern/54882 */
parts->l.d_partitions[part].p_offset ==
parts->l.d_partitions[RAW_PART].p_offset &&
parts->l.d_partitions[part].p_size ==
