Module Name: src
Committed By: martin
Date: Tue Jun 21 16:08:25 UTC 2022
Modified Files:
src/usr.sbin/sysinst: disklabel.c
Log Message:
Fix inverted condition in previous and only apply special handling for
the "all of NetBSD" partition when we have an outer MBR label.
Pointed out by Izumi Tsutsui. Hopefully the last fix needed for PR 56886.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 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.47 src/usr.sbin/sysinst/disklabel.c:1.48
--- src/usr.sbin/sysinst/disklabel.c:1.47 Tue Jun 21 15:42:43 2022
+++ src/usr.sbin/sysinst/disklabel.c Tue Jun 21 16:08:25 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.c,v 1.47 2022/06/21 15:42:43 martin Exp $ */
+/* $NetBSD: disklabel.c,v 1.48 2022/06/21 16:08:25 martin Exp $ */
/*
* Copyright 2018 The NetBSD Foundation, Inc.
@@ -826,7 +826,8 @@ disklabel_set_part_info(struct disk_part
parts->l.d_partitions[part].p_offset = info->start;
if (part != RAW_PART
#if RAW_PART == 3
- || part == RAW_PART-1
+ && (part != RAW_PART-1 ||
+ parts->dp.parent == NULL)
#endif
) {
parts->dp.free_space +=
