Sat Jun 15 07:57:39 2019 UTC ()

After deleting all partitions, reset alignment to the values we would
have used on an empty disk.


(martin)

diff -r1.11 -r1.12 src/usr.sbin/sysinst/mbr.c

--- src/usr.sbin/sysinst/mbr.c 2019/06/12 06:20:17	1.11
+++ src/usr.sbin/sysinst/mbr.c 2019/06/15 07:57:38	1.12

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mbr.c,v 1.11 2019/06/12 06:20:17 martin Exp $ */
+/*	$NetBSD: mbr.c,v 1.12 2019/06/15 07:57:38 martin Exp $ */
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -1674,26 +1674,35 @@ mbr_delete_all(struct disk_partitions *a
 	mbr_info_t *ext;
 	struct mbr_partition *part;
 	part = &mbrs->mbr_parts[0];
 	/* Set the partition information for full disk usage. */
 	while ((ext = mbri->extended)) {
 		mbri->extended = ext->extended;
 		free_mbr_info(ext);
+	}
 	memset(part, 0, MBR_PART_COUNT * sizeof *part);
 #ifdef BOOTSEL
 	memset(&mbri->mbrb, 0, sizeof mbri->mbrb);
 #endif
 	/*
 	 * We may have changed alignment settings due to partitions
 	 * ending on an MB boundary - undo that, now that the partitions
 	 * are gone.
 	 */
 	mbr_change_disk_geom(arg, myparts->geo_cyl, myparts->geo_head,
 	    myparts->geo_sec);
 	return true;
+}
 /*
  * helper function to fix up mbrp_start and mbrp_size for the
  * extended MBRs "partition b" entries after addition/deletion
  * of some partition.
  */
 static void
 mbr_fixup_ext_chain(mbr_info_t *primary, uint ext_start, uint ext_end)
+{
 	for (mbr_info_t *m = primary->extended; m != NULL; m = m->extended) {
 		if (m->extended == NULL) {