Module Name: src
Committed By: martin
Date: Wed Feb 14 13:52:11 UTC 2024
Modified Files:
src/usr.sbin/sysinst: label.c
Log Message:
PR 57927: when comparing old and new partition state during renumbering,
ignore differences in the install target flag - the backend might have
flipped it off already to ensure only a single partition is marked
as install target.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/usr.sbin/sysinst/label.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/label.c
diff -u src/usr.sbin/sysinst/label.c:1.50 src/usr.sbin/sysinst/label.c:1.51
--- src/usr.sbin/sysinst/label.c:1.50 Mon Nov 20 18:03:55 2023
+++ src/usr.sbin/sysinst/label.c Wed Feb 14 13:52:11 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: label.c,v 1.50 2023/11/20 18:03:55 martin Exp $ */
+/* $NetBSD: label.c,v 1.51 2024/02/14 13:52:11 martin Exp $ */
/*
* Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: label.c,v 1.50 2023/11/20 18:03:55 martin Exp $");
+__RCSID("$NetBSD: label.c,v 1.51 2024/02/14 13:52:11 martin Exp $");
#endif
#include <sys/types.h>
@@ -510,7 +510,8 @@ renumber_partitions(struct partition_usa
for (i = 0; i < pset->num; i++) {
if (pset->infos[i].cur_start != info.start)
continue;
- if (pset->infos[i].cur_flags != info.flags)
+ if ((pset->infos[i].cur_flags & ~PTI_INSTALL_TARGET)
+ != (info.flags & ~PTI_INSTALL_TARGET))
continue;
if ((info.flags & PTI_SPECIAL_PARTS) !=
(pset->infos[i].flags & PTI_SPECIAL_PARTS))
