Module Name: src
Committed By: sborrill
Date: Wed Feb 14 15:08:29 UTC 2024
Modified Files:
src/usr.sbin/sysinst [netbsd-10]: label.c
Log Message:
Pull up the following revisions(s) (requested by martin in ticket #594):
usr.sbin/sysinst/label.c: revision 1.51
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.46.2.2 -r1.46.2.3 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.46.2.2 src/usr.sbin/sysinst/label.c:1.46.2.3
--- src/usr.sbin/sysinst/label.c:1.46.2.2 Sun Nov 26 12:40:50 2023
+++ src/usr.sbin/sysinst/label.c Wed Feb 14 15:08:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: label.c,v 1.46.2.2 2023/11/26 12:40:50 bouyer Exp $ */
+/* $NetBSD: label.c,v 1.46.2.3 2024/02/14 15:08:29 sborrill 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.46.2.2 2023/11/26 12:40:50 bouyer Exp $");
+__RCSID("$NetBSD: label.c,v 1.46.2.3 2024/02/14 15:08:29 sborrill Exp $");
#endif
#include <sys/types.h>
@@ -512,7 +512,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.fs_type != FS_UNUSED &&
info.fs_type == pset->infos[i].fs_type) ||
