 @@ -1,14 +1,14 @@
-/*	$NetBSD: bsddisklabel.c,v 1.21 2019/07/15 19:13:05 martin Exp $	*/
+/*	$NetBSD: bsddisklabel.c,v 1.22 2019/07/28 16:03:00 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.
 @@ -894,51 +894,54 @@ ask_layout(struct disk_partitions *parts
 	    -1, -10, 0, 0, MC_NOEXITOPT, NULL, NULL, NULL, NULL, NULL);
 	if (menu != -1) {
 		get_menudesc(menu)->expand_act = expand_all_option_texts;
 		process_menu(menu, &ai);
 		free_menu(menu);
+	}
 	return ai.rv;
+}
 static void
 merge_part_with_wanted(struct disk_partitions *parts, part_id pno,
     const struct disk_part_info *info, struct partition_usage_set *wanted,
-    bool is_outer)
+    size_t wanted_num, bool is_outer)
+{
 	struct part_usage_info *infos;
 	/*
 	 * does this partition match something in the wanted set?
 	 */
-	for (size_t i = 0; i < wanted->num; i++) {
+	for (size_t i = 0; i < wanted_num; i++) {
 		if (wanted->infos[i].type != info->nat_type->generic_ptype)
 			continue;
-		if (info->last_mounted != NULL && info->last_mounted[0] != 0 &&
+		if (wanted->infos[i].type == PT_root &&
 		    info->last_mounted != NULL && info->last_mounted[0] != 0 &&
 		    strcmp(info->last_mounted, wanted->infos[i].mount) != 0)
 			continue;
 		if (wanted->infos[i].cur_part_id != NO_PART)
 			continue;
 		wanted->infos[i].cur_part_id = pno;
 		wanted->infos[i].parts = parts;
 		wanted->infos[i].size = info->size;
 		wanted->infos[i].cur_start = info->start;
 		wanted->infos[i].flags &= ~PUIFLAG_EXTEND;
 		if (wanted->infos[i].fs_type != FS_UNUSED &&
 		    wanted->infos[i].type != PT_swap)
 			wanted->infos[i].instflags |= PUIINST_MOUNT;
 		if (is_outer)
 			wanted->infos[i].flags |= PUIFLG_IS_OUTER;
 		else
 			wanted->infos[i].flags &= ~PUIFLG_IS_OUTER;
 		return;
+	}
 	/*
 	 * no match - if this is fromt the outer scheme, we are done.
 	 * otherwise it must be inserted into the wanted set.
 	 */
 	if (is_outer)
 		return;
 	/*
 	 * create a new entry for this
 	 */
 @@ -1040,56 +1043,57 @@ fill_defaults(struct partition_usage_set
 		    wanted->infos[i].size == 0)
 			/* default tmpfs to 1/4 RAM */
 			wanted->infos[i].def_size =
 			    get_ramsize() * (MEG/512/4);
+	}
 	/*
 	 * Now we have the defaults as if we were installing to an
 	 * empty disk. Merge the partitions in target range that are already
 	 * there (match with wanted) or are there additionaly.
 	 * The only thing outside of target range that we care for
 	 * is a potential swap partition - we assume one is enough.
 	 */
 	size_t num = wanted->num;
 	if (parts->parent) {
 		for (part_id pno = 0; pno < parts->parent->num_part; pno++) {
 			struct disk_part_info info;
 			if (!parts->parent->pscheme->get_part_info(
 			    parts->parent, pno, &info))
 				continue;
 			if (info.nat_type->generic_ptype != PT_swap)
 				continue;
 			merge_part_with_wanted(parts->parent, pno, &info,
-			    wanted, true);
+			    wanted, num, true);
 			break;
+		}
+	}
 	for (part_id pno = 0; pno < parts->num_part; pno++) {
 		struct disk_part_info info;
 		if (!parts->pscheme->get_part_info(parts, pno, &info))
 			continue;
 		if (info.flags & PTI_PSCHEME_INTERNAL)
 			continue;
 		if (info.nat_type->generic_ptype != PT_swap &&
 		    (info.start < ptstart ||
 		    (info.start + info.size) > (ptstart+ptsize)))
 			continue;
 		merge_part_with_wanted(parts, pno, &info,
-		    wanted, false);
+		    wanted, num, false);
+	}
 	daddr_t align = parts->pscheme->get_part_alignment(parts);
 	if (root < wanted->num && wanted->infos[root].cur_part_id == NO_PART) {
 		daddr_t max_root_size = parts->disk_start + parts->disk_size;
 		if (root_limit > 0) {
 			/* Bah - bios can not read all the disk, limit root */
 			max_root_size = root_limit - parts->disk_start;
+		}
 		wanted->infos[root].limit = max_root_size;
+	}