Mon Aug 5 04:37:44 2019 UTC ()

Pull up following revision(s) (requested by martin in ticket #15):
	usr.sbin/sysinst/gpt.c: revision 1.8
When reading an existing gpt, match the wedges already existing
on the parent device, so we can use them directly if we should proceed
with an unmodified partition table.


(msaitoh)

diff -r1.6.2.1 -r1.6.2.2 src/usr.sbin/sysinst/gpt.c

--- src/usr.sbin/sysinst/gpt.c 2019/08/05 04:34:54	1.6.2.1
+++ src/usr.sbin/sysinst/gpt.c 2019/08/05 04:37:44	1.6.2.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: gpt.c,v 1.6.2.1 2019/08/05 04:34:54 msaitoh Exp $	*/
+/*	$NetBSD: gpt.c,v 1.6.2.2 2019/08/05 04:37:44 msaitoh Exp $	*/
 /*
  * Copyright 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -218,31 +218,54 @@ gpt_add_info(struct gpt_part_entry *part
 		while ((n = strsep(&val, ", ")) != NULL) {
 			if (*n == 0)
 				continue;
 			for (const struct gpt_attr_desc *p = gpt_avail_attrs;
 			    p->name != NULL; p++) {
 				if (strcmp(p->name, n) == 0)
 					part->gp_attr |= p->flag;
+			}
+		}
+	}
+}
 /*
  * Find the partition matching this wedge info and record that we
  * have a wedge already.
  */
 static void
 update_part_from_wedge_info(struct gpt_disk_partitions *parts,
     const struct dkwedge_info *dkw)
+{
 	for (struct gpt_part_entry *p = parts->partitions; p != NULL;
 	    p = p->gp_next) {
 		if (p->gp_start != dkw->dkw_offset ||
 		    (uint64_t)p->gp_size != dkw->dkw_size)
 			continue;
 		p->gp_flags |= GPEF_WEDGE;
 		strlcpy(p->gp_dev_name, dkw->dkw_devname,
 		    sizeof p->gp_dev_name);
 		return;
+	}
+}
 static struct disk_partitions *
 gpt_read_from_disk(const char *dev, daddr_t start, daddr_t len)
+{
 	char diskpath[MAXPATHLEN];
 	int fd;
 	struct dkwedge_info *dkw;
 	struct dkwedge_list dkwl;
 	size_t bufsize, dk;
 	assert(start == 0);
 	assert(have_gpt);
 	if (run_program(RUN_SILENT | RUN_ERROR_OK,
 	    "gpt -rq header %s", dev) != 0)
 		return NULL;
 	/* read the partitions */
 	int i;
 	unsigned int p_index;
 	daddr_t p_start = 0, p_size = 0, avail_start = 0, avail_size = 0,
 	    disk_size = 0;
 @@ -374,26 +397,46 @@ gpt_read_from_disk(const char *dev, dadd
 				p->fs_type = p->gp_type->default_fs_type;
 #ifdef DEFAULT_UFS2
 				fs_is_default = true;
 #endif
+			}
 #ifdef DEFAULT_UFS2
 			if (fs_is_default && p->fs_type == FS_BSDFFS)
 				p->fs_sub_type = 2;
 #endif
+		}
 		parts->dp.free_space -= p->gp_size;
+	}
 	/*
 	 * Check if we have any (matching/auto-configured) wedges already
 	 */
 	dkw = NULL;
 	dkwl.dkwl_buf = dkw;
 	dkwl.dkwl_bufsize = 0;
 	if (ioctl(fd, DIOCLWEDGES, &dkwl) == 0) {
 		/* do not even try to deal with any races at this point */
 		bufsize = dkwl.dkwl_nwedges * sizeof(*dkw);
 		dkw = malloc(bufsize);
 		dkwl.dkwl_buf = dkw;
 		dkwl.dkwl_bufsize = bufsize;
 		if (dkw != NULL && ioctl(fd, DIOCLWEDGES, &dkwl) == 0) {
 			for (dk = 0; dk < dkwl.dkwl_ncopied; dk++)
 				update_part_from_wedge_info(parts, &dkw[dk]);
+		}
 		free(dkw);
+	}
 	close(fd);
 	return &parts->dp;
+}
 static struct disk_partitions *
 gpt_create_new(const char *disk, daddr_t start, daddr_t len, daddr_t total,
     bool is_boot_drive)
+{
 	struct gpt_disk_partitions *parts;
 	if (start != 0) {
 		assert(0);