Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When renumbering partitions (after deletions) be slightly more lax 

in matching, to cope with differences between MBR EFI partitions and
disklabel MSDOS partitions.
This commit is contained in:
martin 2020-10-13 11:28:32 +00:00
parent 29ef4ac716
commit a207068d8b
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
usr.sbin/sysinst/label.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: label.c,v 1.28 2020/10/10 19:42:19 martin Exp $ */
/* $NetBSD: label.c,v 1.29 2020/10/13 11:28:32 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.28 2020/10/10 19:42:19 martin Exp $");
__RCSID("$NetBSD: label.c,v 1.29 2020/10/13 11:28:32 martin Exp $");
#endif
#include <sys/types.h>
@ -413,12 +413,15 @@ renumber_partitions(struct partition_usage_set *pset)
continue;
if (pset->infos[i].cur_flags != info.flags)
continue;
if (pset->infos[i].type != info.nat_type->generic_ptype)
continue;
memcpy(&ninfos[pno], &pset->infos[i],
sizeof(ninfos[pno]));
ninfos[pno].cur_part_id = pno;
break;
if ((info.fs_type != FS_UNUSED &&
info.fs_type == pset->infos[i].fs_type) ||
(pset->infos[i].type ==
info.nat_type->generic_ptype)) {
memcpy(&ninfos[pno], &pset->infos[i],
sizeof(ninfos[pno]));
ninfos[pno].cur_part_id = pno;
break;
}
}
}