 @@ -1,14 +1,14 @@
-/*	$NetBSD: bsddisklabel.c,v 1.19 2019/07/12 18:28:08 martin Exp $	*/
+/*	$NetBSD: bsddisklabel.c,v 1.20 2019/07/14 11:26:18 martin Exp $	*/
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Based on code 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.
 @@ -1365,28 +1365,26 @@ apply_settings_to_partitions(struct pm_d
 			    outer_align, from, -1);
 			if (cnt == 0)	/* no free space for this partition */
 				continue;
 			infos[i].start = space.start;
 			infos[i].size = min(want->size, space.size);
 			infos[i].nat_type =
 			    ps->pscheme->get_fs_part_type(
 			        want->fs_type, want->fs_version);
 			infos[i].last_mounted = want->mount;
 			infos[i].fs_type = want->fs_type;
 			infos[i].fs_sub_type = want->fs_version;
 			if (want->fs_type != FS_UNUSED && want->type != PT_swap)
 				want->instflags |= PUIINST_NEWFS|PUIINST_MOUNT;
 			new_part_id = ps->pscheme->add_partition(ps,
 			    &infos[i], NULL);
 			if (new_part_id == NO_PART)
 				continue;	/* failed to add, skip */
 			ps->pscheme->get_part_info(ps,
 			    new_part_id, &infos[i]);
 			want->cur_part_id = new_part_id;
 			want->flags |= PUIFLAG_ADD_INNER|PUIFLG_IS_OUTER;
 			from = rounddown(infos[i].start +
 			    infos[i].size+outer_align, outer_align);
+		}
 @@ -1410,28 +1408,31 @@ apply_settings_to_partitions(struct pm_d
 		    -1);
 		if (cnt == 0)
 			continue;	/* no free space for this partition */
 		infos[i].start = space.start;
 		infos[i].size = min(want->size, space.size);
 		infos[i].nat_type =
 		    wanted->parts->pscheme->get_fs_part_type(want->fs_type,
 		    want->fs_version);
 		infos[i].last_mounted = want->mount;
 		infos[i].fs_type = want->fs_type;
 		infos[i].fs_sub_type = want->fs_version;
-		if (want->fs_type != FS_UNUSED && want->type != PT_swap)
+		if (want->fs_type != FS_UNUSED && want->type != PT_swap) {
-			want->instflags |= PUIINST_NEWFS|PUIINST_MOUNT;
+			want->instflags |= PUIINST_NEWFS;
 			if (want->mount[0] != 0)
 				want->instflags |= PUIINST_MOUNT;
+		}
 		new_part_id = wanted->parts->pscheme->add_partition(
 		    wanted->parts, &infos[i], NULL);
 		if (new_part_id == NO_PART)
 			continue;	/* failed to add, skip */
 		wanted->parts->pscheme->get_part_info(
 		    wanted->parts, new_part_id, &infos[i]);
 		from = rounddown(infos[i].start+infos[i].size+align, align);
+	}
 	/*
 	* If there are any outer partitions that we need as inner ones
 @@ -1448,29 +1449,26 @@ apply_settings_to_partitions(struct pm_d
 			continue;
 		if ((want->flags & (PUIFLAG_ADD_INNER|PUIFLG_IS_OUTER)) !=
 		    (PUIFLAG_ADD_INNER|PUIFLG_IS_OUTER))
 			continue;
 		infos[i].start = want->cur_start;
 		infos[i].size = want->size;
 		infos[i].nat_type = wanted->parts->pscheme->get_fs_part_type(
 		    want->fs_type, want->fs_version);
 		infos[i].last_mounted = want->mount;
 		infos[i].fs_type = want->fs_type;
 		infos[i].fs_sub_type = want->fs_version;
 		if (want->fs_type != FS_UNUSED &&
 		    want->type != PT_swap)
 			want->instflags |= PUIINST_NEWFS|PUIINST_MOUNT;
 		if (wanted->parts->pscheme->add_outer_partition
 		    != NULL)
 			new_part_id = wanted->parts->pscheme->
 			    add_outer_partition(
 			    wanted->parts, &infos[i], NULL);
 		else
 			new_part_id = wanted->parts->pscheme->
 			    add_partition(
 			    wanted->parts, &infos[i], NULL);
 		if (new_part_id == NO_PART)
 			continue;	/* failed to add, skip */
 @@ -1653,57 +1651,65 @@ make_bsd_partitions(struct install_parti
 		/* and check them */
 		if (check_partitions(install))
 			break;
+	}
 	/* we moved infos from wanted to install target */
 	wanted.infos = NULL;
 	free_usage_set(&wanted);
 	/* Everything looks OK. */
 	return true;
+}
 #ifndef MD_NEED_BOOTBLOCK
 #define MD_NEED_BOOTBLOCK(A)	true
 #endif
 /*
  * check that there is at least a / somewhere.
  */
 bool
 check_partitions(struct install_partition_desc *install)
+{
 #ifdef HAVE_BOOTXX_xFS
 	int rv = 1;
 	char *bootxx;
 #endif
 #ifndef HAVE_UFS2_BOOT
 	size_t i;
 #endif
 #ifdef HAVE_BOOTXX_xFS
-	/* check if we have boot code for the root partition type */
+	if (MD_NEED_BOOTBLOCK(install)) {
-	bootxx = bootxx_name(install);
+		/* check if we have boot code for the root partition type */
-	if (bootxx != NULL) {
+		bootxx = bootxx_name(install);
-		rv = access(bootxx, R_OK);
+		if (bootxx != NULL) {
-		free(bootxx);
+			rv = access(bootxx, R_OK);
-	} else
+			free(bootxx);
-		rv = -1;
+		} else
-	if (rv != 0) {
+			rv = -1;
-		hit_enter_to_continue(NULL, MSG_No_Bootcode);
+		if (rv != 0) {
-		return false;
+			hit_enter_to_continue(NULL, MSG_No_Bootcode);
 			return false;
+		}
+	}
 #endif
 #ifndef HAVE_UFS2_BOOT
-	for (i = 0; i < install->num; i++) {
+	if (MD_NEED_BOOTBLOCK(install)) {
-		if (install->infos[i].type != PT_root)
+		for (i = 0; i < install->num; i++) {
-			continue;
+			if (install->infos[i].type != PT_root)
-		if (strcmp(install->infos[i].mount, "/") != 0)
+				continue;
-			continue;
+			if (strcmp(install->infos[i].mount, "/") != 0)
-		if (install->infos[i].fs_type != FS_BSDFFS)
+				continue;
-			continue;
+			if (install->infos[i].fs_type != FS_BSDFFS)
-		if (install->infos[i].fs_version != 2)
+				continue;
-			continue;
+			if (install->infos[i].fs_version != 2)
-		hit_enter_to_continue(NULL, MSG_cannot_ufs2_root);
+				continue;
-		return false;
+			hit_enter_to_continue(NULL, MSG_cannot_ufs2_root);
 			return false;
+		}
+	}
 #endif
 	return md_check_partitions(install);
+}