 @@ -1,14 +1,14 @@
-/*	$NetBSD: md.c,v 1.10 2022/01/29 16:01:19 martin Exp $	*/
+/*	$NetBSD: md.c,v 1.10.2.1 2023/08/21 11:05:54 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.
 @@ -107,45 +107,60 @@ md_get_info(struct install_partition_des
 	return true;
+}
 /*
  * md back-end code for menu-driven BSD disklabel editor.
  */
 int
 md_make_bsd_partitions(struct install_partition_desc *install)
+{
 	return make_bsd_partitions(install);
+}
 static part_id
 find_boot_part(struct install_partition_desc *install)
+{
 	for (size_t i = 0; i < install->num; i++) {
 		if (install->infos[i].fs_type != PART_BOOT_TYPE)
 			continue;
 		if (install->infos[i].fs_version != PART_BOOT_SUBT)
 			continue;
 		if (install->infos[i].size < (PART_BOOT/512))
 			continue;
 		if (install->infos[i].cur_start > 0)
 			continue;
 		return i;
+	}
 	return NO_PART;
+}
 /*
  * any additional partition validation
  */
 bool
 md_check_partitions(struct install_partition_desc *install)
+{
 	/*
 	 * Make sure that a boot partition (old 4.3BSD UFS) is prepared
 	 * properly for our native bootloader.
 	 */
-	if (install->num < 1 || install->infos[0].fs_type != PART_BOOT_TYPE ||
+	if (find_boot_part(install) != NO_PART)
-	    install->infos[0].fs_version != PART_BOOT_SUBT ||
+		return true;
 	    !(install->infos[0].instflags & PUIINST_NEWFS)) {
-		msg_display(MSG_nobootpartdisklabel);
+	msg_display(MSG_nobootpartdisklabel);
-		process_menu(MENU_ok, NULL);
+	process_menu(MENU_ok, NULL);
-		return false;
+	return false;
 	return true;
+}
 /*
  * hook called before writing new disklabel.
  */
 bool
 md_pre_disklabel(struct install_partition_desc *install,
      struct disk_partitions *parts)
+{
 	return true;
+}
 @@ -177,36 +192,39 @@ copy_bootloader(const char *diskdev)
+	}
 	return 0;
+}
 /*
  * hook called after install() has finished setting up the target disk
  * but immediately before the user is given the ``disks are now set up''
  * message.
  */
 int
 md_post_newfs(struct install_partition_desc *install)
+{
 	char rdisk[STRSIZE], disk[STRSIZE];
 	part_id boot_part = find_boot_part(install);
-	if (install->num < 1)
+	if (boot_part == NO_PART)
 		return 1;
-	if (!install->infos[0].parts->pscheme->get_part_device(
+	if (!install->infos[boot_part].parts->pscheme->get_part_device(
-	    install->infos[0].parts, install->infos[0].cur_part_id,
+	    install->infos[boot_part].parts,
 	    install->infos[boot_part].cur_part_id,
  	    rdisk, sizeof rdisk, NULL, raw_dev_name, true, true))
 		return 1;
-	if (!install->infos[0].parts->pscheme->get_part_device(
+	if (!install->infos[boot_part].parts->pscheme->get_part_device(
-	    install->infos[0].parts, install->infos[0].cur_part_id,
+	    install->infos[boot_part].parts,
 	    install->infos[boot_part].cur_part_id,
 	    disk, sizeof disk, NULL, plain_name, true, true))
 		return 1;
 	if (run_program(RUN_DISPLAY | RUN_PROGRESS,
 	    "/sbin/newfs -V2 -O 0 -b %d -f %d %s",
 	    PART_BOOT_BSIZE, PART_BOOT_FSIZE, rdisk))
 		return 1;
 	return copy_bootloader(disk);
+}
 int
 md_post_extract(struct install_partition_desc *install, bool upgrade)
+{
 @@ -230,32 +248,34 @@ md_pre_update(struct install_partition_d
+{
 	return 1;
+}
 /* Upgrade support */
 int
 md_update(struct install_partition_desc *install)
+{
 	const char *mntdir = "/mnt2";
 	char bootpath[MAXPATHLEN];
 	struct stat sb;
 	bool hasboot = false;
 	char disk[STRSIZE];
 	part_id boot_part = find_boot_part(install);
-	if (install->num < 1)
+	if (boot_part == NO_PART)
 		return 0;
-	if (!install->infos[0].parts->pscheme->get_part_device(
+	if (!install->infos[boot_part].parts->pscheme->get_part_device(
-	    install->infos[0].parts, install->infos[0].cur_part_id,
+	    install->infos[boot_part].parts,
 	    install->infos[boot_part].cur_part_id,
  	    disk, sizeof disk, NULL, plain_name, true, true))
 		return 0;
 	/*
 	 * Check if there is a boot UFS parttion and it has the old bootloader.
 	 * We'll update bootloader only if the old one was installed.
 	 */
 	if (!run_program(RUN_SILENT | RUN_ERROR_OK,
 	    "mount -r %s %s", disk, mntdir)) {
 		mnt2_mounted = 1;
 		snprintf(bootpath, sizeof(bootpath), "%s/%s", mntdir, "boot");
 		if (stat(bootpath, &sb) == 0 && S_ISREG(sb.st_mode))
 			hasboot = true;
 @@ -278,14 +298,13 @@ md_parts_use_wholedisk(struct disk_parti
+{
 	return parts_use_wholedisk(parts, 0, NULL);
+}
 #ifdef HAVE_GPT
 bool
 md_gpt_post_write(struct disk_partitions *parts, part_id root_id,
     bool root_is_new, part_id efi_id, bool efi_is_new)
+{
 	/* no GPT boot support, nothing needs to be done here */
 	return true;
+}
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: md.h,v 1.6 2022/06/17 16:09:47 tsutsui Exp $	*/
+/*	$NetBSD: md.h,v 1.6.2.1 2023/08/21 11:05:54 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.
 @@ -54,13 +54,25 @@
 /*
  * Default filesets to fetch and install during installation
  * or upgrade.
  */
 #define SET_KERNEL_1_NAME	"kern-GENERIC"
 /*
  * Machine-specific command to write a new label to a disk.
  * If not defined, we assume the port does not support disklabels and
  * the hand-edited disklabel will NOT be written by MI code.
  */
 #define DISKLABEL_CMD	"disklabel -w -r"
 /*
  * Our boot partition is FFSv1, so it will be reported as PT_root
  * and might take up disklabel slot 0 (partition 'a'), which we would
  * like to avoid and make it use 'd' instead.
  * Only allow PT_root partitions for slots before RAW_PART if they
  * start past the boot partition size.
  */
 #define	MD_DISKLABEL_PART_INDEX_CHECK(DL,NDX,INFO)	\
 	(((INFO)->nat_type->generic_ptype != PT_root)	\
 	|| (NDX > RAW_PART)				\
 	|| ((INFO)->start >= (PART_BOOT/512)))