 @@ -1,14 +1,14 @@
-/*	$NetBSD: bsddisklabel.c,v 1.3 2018/05/18 12:23:22 joerg Exp $	*/
+/*	$NetBSD: bsddisklabel.c,v 1.4 2018/06/03 13:16:30 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.
 @@ -556,26 +556,29 @@ get_ptn_sizes(daddr_t part_start, daddr_
  */
 int
 make_bsd_partitions(void)
+{
 	int i;
 	int part;
 	int maxpart = getmaxpartitions();
 	daddr_t partstart;
 	int part_raw, part_bsd;
 	daddr_t ptend;
 	int no_swap = 0, valid_part = -1;
 	partinfo *p, savedlabel[MAXPARTITIONS];
 	if (pm && pm->no_part)
 		return 1;
 	memcpy(&savedlabel, &pm->bsdlabel, sizeof savedlabel);
 	/*
 	 * Initialize global variables that track space used on this disk.
 	 * Standard 4.4BSD 8-partition labels always cover whole disk.
 	 */
 	if (pm->ptsize == 0)
 		pm->ptsize = pm->dlsize - pm->ptstart;
 	if (pm->dlsize == 0)
 		pm->dlsize = pm->ptstart + pm->ptsize;
 	if (logfp) fprintf(logfp, "dlsize=%" PRId64 " ptsize=%" PRId64
 	    " ptstart=%" PRId64 "\n",
 	    pm->dlsize, pm->ptsize, pm->ptstart);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: defs.h,v 1.10 2018/05/18 12:23:22 joerg Exp $	*/
+/*	$NetBSD: defs.h,v 1.11 2018/06/03 13:16:30 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
 @@ -284,26 +284,27 @@ typedef struct pm_devs_t {
     int found; /* Flag to delete unplugged and unconfigured devices */
     int blocked; /* Device is busy and cannot be changed */
     void *refdev; /* If device is blocked thats is a pointers to a parent dev */
     int isspecial; /* LVM LV or DK device that doesnot accept disklabel */
     char diskdev[SSTRSIZE]; /* Actual name of the disk. */
     char diskdev_descr[STRSIZE];
     int bootable;
 #define DISKNAME_SIZE 16
     char bsddiskname[DISKNAME_SIZE];
     partinfo oldlabel[MAXPARTITIONS]; /* What we found on the disk */
     partinfo bsdlabel[MAXPARTITIONS]; /* What we want it to look like */
     int gpt;
     int no_mbr; /* set for raid (etc) */
     int no_part;	/* can not be partitioned, e.g. dk0 */
     int rootpart; /* partition we install into */
     const char *disktype; /* ST506, SCSI, ... */
     const char *doessf;
     /* Actual values for current disk - set by find_disks() or md_get_info() */
     int sectorsize, dlcyl, dlhead, dlsec, dlcylsize, current_cylsize;
     daddr_t dlsize;
     /* Area of disk we can allocate, start and size in disk sectors. */
     daddr_t ptstart, ptsize;
     /* If we have an MBR boot partition, start and size in sectors */
     int bootstart, bootsize;
     struct ptn_info pi;
     SLIST_ENTRY(pm_devs_t) l;
 } pm_devs_t;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg.mi.en,v 1.10 2015/05/17 10:13:24 martin Exp $	*/
+/*	$NetBSD: msg.mi.en,v 1.11 2018/06/03 13:16:30 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
 @@ -1179,13 +1179,21 @@ message lvmlv_size_ask {Size (MB)?}
 message lvmlv_extnum_ask {LogicalExtentsNumber?}
 message lvmlv_minor_ask {Minor number?}
 message lvmlv_mirrors_ask {Mirrors?}
 message lvmlv_regsiz_ask {MirrorLogRegionSize?}
 message lvmlv_readahsect_ask {ReadAheadSectors?}
 message lvmlv_stripes_ask {Stripes?}
 message addusername {8 character username to add}
 message addusertowheel {Do you wish to add this user to group wheel?}
 message Delete_partition
 {Delete partition}
 message No_filesystem_newfs
 {The selected partition does not seem to have a valid file system.
 Do you want to newfs (format) it?}
 message Auto_add_swap_part
 {A swap partition (named %s) seems to exist on %s.
 Do you want to use that?}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: disks.c,v 1.14 2018/05/01 09:01:45 martin Exp $ */
+/*	$NetBSD: disks.c,v 1.15 2018/06/03 13:16:30 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
 @@ -58,27 +58,27 @@
 #include <dev/ata/atareg.h>
 #include <sys/ataio.h>
 #include "defs.h"
 #include "md.h"
 #include "msg_defs.h"
 #include "menu_defs.h"
 #include "txtwalk.h"
 /* Disk descriptions */
 struct disk_desc {
 	char	dd_name[SSTRSIZE];
 	char	dd_descr[70];
-	uint	dd_no_mbr;
+	bool	dd_no_mbr, dd_no_part;
 	uint	dd_cyl;
 	uint	dd_head;
 	uint	dd_sec;
 	uint	dd_secsize;
 	uint	dd_totsec;
 };
 /* gpt(8) use different filesystem names.
    So, we cant use ./common/lib/libutil/getfstypename.c */
 struct gptfs_t {
     const char *name;
     int id;
     uuid_t uuid;
 @@ -94,36 +94,37 @@ static const struct gptfs_t gpt_filesyst
     { "ccd", FS_CCD, GPT_ENT_TYPE_NETBSD_CCD, },
     { "raid", FS_RAID, GPT_ENT_TYPE_NETBSD_RAIDFRAME, },
     { "cgd", FS_CGD, GPT_ENT_TYPE_NETBSD_CGD, },
     { "efi", FS_OTHER, GPT_ENT_TYPE_EFI, },
     { "bios", FS_OTHER, GPT_ENT_TYPE_BIOS, },
     { NULL, -1, GPT_ENT_TYPE_UNUSED, },
 };
 /* Local prototypes */
 static int foundffs(struct data *, size_t);
 #ifdef USE_SYSVBFS
 static int foundsysvbfs(struct data *, size_t);
 #endif
-static int fsck_preen(const char *, int, const char *);
+static int fsck_preen(const char *, int, const char *, bool silent);
 static void fixsb(const char *, const char *, char);
 static bool is_gpt(const char *);
 static int incoregpt(pm_devs_t *, partinfo *);
 #ifndef DISK_NAMES
 #define DISK_NAMES "wd", "sd", "ld", "raid"
 #endif
-static const char *disk_names[] = { DISK_NAMES, "vnd", "cgd", NULL };
+static const char *disk_names[] = { DISK_NAMES,
 				    "vnd", "cgd", "dk:no_part", NULL };
 static bool tmpfs_on_var_shm(void);
 const char *
 getfslabelname(uint8_t f)
+{
 	if (f >= __arraycount(fstypenames) || fstypenames[f] == NULL)
 		return "invalid";
 	return fstypenames[f];
+}
 /*
  * Decide wether we want to mount a tmpfs on /var/shm: we do this always
 @@ -386,127 +387,260 @@ get_default_cdrom(void)
 			if (strncmp(cd_dev, name, strlen(cd_dev) - 2) != 0)
 				continue;
 			if (name != disknames)
 				strcpy(disknames, name);
 			strcat(disknames, "a");
 			/* XXX: leaks, but so what? */
 			return disknames;
+		}
+	}
 	free(disknames);
 	return cdrom_devices[0];
+}
 static void
 get_wedge_descr(struct disk_desc *dd)
+{
 	struct dkwedge_info dkw;
 	char buf[MAXPATHLEN];
 	int fd;
 	fd = opendisk(dd->dd_name, O_RDONLY, buf, sizeof(buf), 0);
 	if (fd == -1)
 		return;
 	if (ioctl(fd, DIOCGWEDGEINFO, &dkw) == 0) {
 		fprintf(stderr, "device %s\n", dd->dd_name);
 		sprintf(dd->dd_descr, "%s (%s@%s)",
 		    dkw.dkw_wname, dkw.dkw_devname, dkw.dkw_parent);
+	}
 	close(fd);
+}
 static bool
 get_name_and_parent(const char *dev, char *name, char *parent)
+{
 	struct dkwedge_info dkw;
 	char buf[MAXPATHLEN];
 	int fd;
 	bool res = false;
 	fd = opendisk(dev, O_RDONLY, buf, sizeof(buf), 0);
 	if (fd == -1)
 		return false;
 	if (ioctl(fd, DIOCGWEDGEINFO, &dkw) == 0) {
 		strcpy(name, (const char *)dkw.dkw_wname);
 		strcpy(parent, dkw.dkw_parent);
 		res = true;
+	}
 	close(fd);
 	return res;
+}
 static bool
 find_swap_part_on(const char *dev, char *swap_name)
+{
 	struct dkwedge_info *dkw;
 	struct dkwedge_list dkwl;
 	char buf[MAXPATHLEN];
 	size_t bufsize;
 	int fd;
 	u_int i;
 	bool res = false;
 	dkw = NULL;
 	dkwl.dkwl_buf = dkw;
 	dkwl.dkwl_bufsize = 0;
 	fd = opendisk(dev, O_RDONLY, buf, sizeof(buf), 0);
 	if (fd == -1)
 		return false;
 	for (;;) {
 		if (ioctl(fd, DIOCLWEDGES, &dkwl) == -1) {
 			dkwl.dkwl_ncopied = 0;
 			break;
+		}
 		if (dkwl.dkwl_nwedges == dkwl.dkwl_ncopied)
 			break;
 		bufsize = dkwl.dkwl_nwedges * sizeof(*dkw);
 		if (dkwl.dkwl_bufsize < bufsize) {
 			dkw = realloc(dkwl.dkwl_buf, bufsize);
 			if (dkw == NULL)
 				break;
 			dkwl.dkwl_buf = dkw;
 			dkwl.dkwl_bufsize = bufsize;
+		}
+	}
 	for (i = 0; i < dkwl.dkwl_nwedges; i++) {
 		res = strcmp(dkw[i].dkw_ptype, DKW_PTYPE_SWAP) == 0;
 		if (res) {
 			strcpy(swap_name, (const char*)dkw[i].dkw_wname);
 			break;
+		}
+	}
 	close(fd);
 	return res;
+}
 static bool
 is_ffs_wedge(const char *dev)
+{
 	struct dkwedge_info dkw;
 	char buf[MAXPATHLEN];
 	int fd;
 	bool res;
 	fd = opendisk(dev, O_RDONLY, buf, sizeof(buf), 0);
 	if (fd == -1)
 		return false;
 	if (ioctl(fd, DIOCGWEDGEINFO, &dkw) == -1)
 		return false;
 	res = strcmp(dkw.dkw_ptype, DKW_PTYPE_FFS) == 0;
 	close(fd);
 	return res;
+}
 static int
-get_disks(struct disk_desc *dd)
+get_disks(struct disk_desc *dd, bool with_non_partitionable)
+{
 	const char **xd;
 	char *cp;
 	struct disklabel l;
 	int i;
 	int numdisks;
 	/* initialize */
 	numdisks = 0;
 	for (xd = disk_names; *xd != NULL; xd++) {
 		for (i = 0; i < MAX_DISKS; i++) {
 			strlcpy(dd->dd_name, *xd, sizeof dd->dd_name - 2);
 			cp = strchr(dd->dd_name, ':');
-			if (cp != NULL)
+			if (cp != NULL) {
 				dd->dd_no_mbr = !strcmp(cp, ":no_mbr");
-			else {
+				dd->dd_no_part = !strcmp(cp, ":no_part");
-				dd->dd_no_mbr = 0;
+			} else {
 				dd->dd_no_mbr = false;
 				dd->dd_no_part = false;
 				cp = strchr(dd->dd_name, 0);
+			}
 			if (dd->dd_no_part && !with_non_partitionable)
 				continue;
 			snprintf(cp, 2 + 1, "%d", i);
 			if (!get_geom(dd->dd_name, &l)) {
 				if (errno == ENOENT)
 					break;
-				continue;
+				if (errno != ENOTTY || !dd->dd_no_part)
 					/*
 					 * Allow plain partitions,
 					 * like already existing wedges
 					 * (like dk0) if marked as
 					 * non-partitioning device.
 					 * For all other cases, continue
 					 * with the next disk.
 					 */
 					continue;
 				if (!is_ffs_wedge(dd->dd_name))
 					continue;
+			}
 			/*
 			 * Exclude a disk mounted as root partition,
 			 * in case of install-image on a USB memstick.
 			 */
 			if (is_active_rootpart(dd->dd_name, 0))
 				continue;
-			dd->dd_cyl = l.d_ncylinders;
+			if (!dd->dd_no_part) {
-			dd->dd_head = l.d_ntracks;
+				dd->dd_cyl = l.d_ncylinders;
-			dd->dd_sec = l.d_nsectors;
+				dd->dd_head = l.d_ntracks;
-			dd->dd_secsize = l.d_secsize;
+				dd->dd_sec = l.d_nsectors;
-			dd->dd_totsec = l.d_secperunit;
+				dd->dd_secsize = l.d_secsize;
-			get_descr(dd);
+				dd->dd_totsec = l.d_secperunit;
+			}
 			if (dd->dd_no_part)
 				get_wedge_descr(dd);
 			else
 				get_descr(dd);
 			dd++;
 			numdisks++;
 			if (numdisks >= MAX_DISKS)
 				return numdisks;
+		}
+	}
 	return numdisks;
+}
 int
 find_disks(const char *doingwhat)
+{
 	struct disk_desc disks[MAX_DISKS];
 	menu_ent dsk_menu[nelem(disks) + 1]; // + 1 for extended partitioning entry
 	struct disk_desc *disk;
-	int i, already_found;
+	int i = 0, skipped = 0;
-	int numdisks, selected_disk = -1;
+	int already_found, numdisks, selected_disk = -1;
 	int menu_no;
 	pm_devs_t *pm_i, *pm_last = NULL;
 	/* Find disks. */
-	numdisks = get_disks(disks);
+	numdisks = get_disks(disks, partman_go <= 0);
 	/* need a redraw here, kernel messages hose everything */
 	touchwin(stdscr);
 	refresh();
 	/* Kill typeahead, it won't be what the user had in mind */
 	fpurge(stdin);
 	/*
 	 * partman_go: <0 - we want to see menu with extended partitioning
 	 *            ==0 - we want to see simple select disk menu
 	 *             >0 - we do not want to see any menus, just detect
 	 *                  all disks
 	 */
 	if (partman_go <= 0) {
 		if (numdisks == 0) {
 			/* No disks found! */
 			msg_display(MSG_nodisk);
 			process_menu(MENU_ok, NULL);
 			/*endwin();*/
 			return -1;
 		} else {
 			/* One or more disks found! */
 			for (i = 0; i < numdisks; i++) {
-				dsk_menu[i].opt_name = disks[i].dd_descr;
+				dsk_menu[i].opt_name =
 				    disks[i].dd_descr;
 				dsk_menu[i].opt_menu = OPT_NOMENU;
 				dsk_menu[i].opt_flags = OPT_EXIT;
 				dsk_menu[i].opt_action = set_menu_select;
+			}
 			if (partman_go < 0) {
 				dsk_menu[i].opt_name = MSG_partman;
 				dsk_menu[i].opt_menu = OPT_NOMENU;
 				dsk_menu[i].opt_flags = OPT_EXIT;
 				dsk_menu[i].opt_action = set_menu_select;
+			}
 			menu_no = new_menu(MSG_Available_disks,
-				dsk_menu, numdisks + ((partman_go<0)?1:0), -1, 4, 0, 0, MC_SCROLL,
+				dsk_menu, numdisks
 				 + ((partman_go<0)?1:0), -1,
 , 0, 0, MC_SCROLL,
 				NULL, NULL, NULL, NULL, NULL);
 			if (menu_no == -1)
 				return -1;
 			msg_display(MSG_ask_disk, doingwhat);
 			process_menu(menu_no, &selected_disk);
 			free_menu(menu_no);
+		}
 		if (partman_go < 0 && selected_disk == numdisks) {
 			partman_go = 1;
 			return -2;
 		} else
 			partman_go = 0;
 		if (selected_disk < 0 || selected_disk >= numdisks)
 @@ -535,64 +669,80 @@ find_disks(const char *doingwhat)
 		pm = pm_new;
 		pm->found = 1;
 		pm->bootable = 0;
 		pm->pi.menu_no = -1;
 		pm->disktype = "unknown";
 		pm->doessf = "";
 		strlcpy(pm->diskdev, disk->dd_name, sizeof pm->diskdev);
 		strlcpy(pm->diskdev_descr, disk->dd_descr, sizeof pm->diskdev_descr);
 		/* Use as a default disk if the user has the sets on a local disk */
 		strlcpy(localfs_dev, disk->dd_name, sizeof localfs_dev);
 		pm->gpt = is_gpt(pm->diskdev);
 		pm->no_mbr = disk->dd_no_mbr || pm->gpt;
-		pm->sectorsize = disk->dd_secsize;
+		pm->no_part = disk->dd_no_part;
-		pm->dlcyl = disk->dd_cyl;
+		if (!pm->no_part) {
-		pm->dlhead = disk->dd_head;
+			pm->sectorsize = disk->dd_secsize;
-		pm->dlsec = disk->dd_sec;
+			pm->dlcyl = disk->dd_cyl;
-		pm->dlsize = disk->dd_totsec;
+			pm->dlhead = disk->dd_head;
-		if (pm->dlsize == 0)
+			pm->dlsec = disk->dd_sec;
-			pm->dlsize = disk->dd_cyl * disk->dd_head * disk->dd_sec;
+			pm->dlsize = disk->dd_totsec;
-		if (pm->dlsize > UINT32_MAX && ! partman_go) {
+			if (pm->dlsize == 0)
-			if (logfp)
+				pm->dlsize = disk->dd_cyl * disk->dd_head * disk->dd_sec;
-				fprintf(logfp, "Cannot process disk %s: too big size (%d)\n",
+			if (pm->dlsize > UINT32_MAX && ! partman_go) {
-					pm->diskdev, (int)pm->dlsize);
+				if (logfp)
-			msg_display(MSG_toobigdisklabel);
+					fprintf(logfp, "Cannot process disk %s: too big size (%d)\n",
-			process_menu(MENU_ok, NULL);
+						pm->diskdev, (int)pm->dlsize);
-			return -1;
+				msg_display(MSG_toobigdisklabel);
 				process_menu(MENU_ok, NULL);
 				return -1;
+			}
 		} else {
 			pm->sectorsize = 0;
 			pm->dlcyl = 0;
 			pm->dlhead = 0;
 			pm->dlsec = 0;
 			pm->dlsize = 0;
 			pm->rootpart = -1;
 			pm->no_mbr = 1;
 			memset(&pm->bsdlabel, 0, sizeof(pm->bsdlabel));
+		}
 		pm->dlcylsize = pm->dlhead * pm->dlsec;
 		label_read();
 		if (partman_go) {
 			pm_getrefdev(pm_new);
 			if (SLIST_EMPTY(&pm_head) || pm_last == NULL)
 				 SLIST_INSERT_HEAD(&pm_head, pm_new, l);
 			else
 				 SLIST_INSERT_AFTER(pm_last, pm_new, l);
 			pm_new = malloc(sizeof (pm_devs_t));
 			memset(pm_new, 0, sizeof *pm_new);
 		} else
 			/* We is not in partman and do not want to process all devices, exit */
 			break;
+	}
-	return numdisks;
+	return numdisks-skipped;
+}
 void
 label_read(void)
+{
 	if (pm->no_part)
 		return;
 	check_available_binaries();
 	/* Get existing/default label */
 	memset(&pm->oldlabel, 0, sizeof pm->oldlabel);
 	if (!have_gpt || !pm->gpt)
 		incorelabel(pm->diskdev, pm->oldlabel);
 	else
 		incoregpt(pm, pm->oldlabel);
 	/* Set 'target' label to current label in case we don't change it */
 	memcpy(&pm->bsdlabel, &pm->oldlabel, sizeof pm->bsdlabel);
 #ifndef NO_DISKLABEL
 	if (! pm->gpt)
 		savenewlabel(pm->oldlabel, getmaxpartitions());
 @@ -649,26 +799,29 @@ fmt_fspart(menudesc *m, int ptn, void *a
  * if MD code does not define DISKLABEL_CMD, this is a no-op.
+ *
  * i386 port uses "/sbin/disklabel -w -r", just like i386
  * miniroot scripts, though this may leave a bogus incore label.
+ *
  * Sun ports should use DISKLABEL_CMD "/sbin/disklabel -w"
  * to get incore to ondisk inode translation for the Sun proms.
  */
 int
 write_disklabel (void)
+{
 	int rv = 0;
 	if (pm && pm->no_part)
 		return 0;
 #ifdef DISKLABEL_CMD
 	/* disklabel the disk */
 	rv = run_program(RUN_DISPLAY, "%s -f /tmp/disktab %s '%s'",
 	    DISKLABEL_CMD, pm->diskdev, pm->bsddiskname);
 	if (rv == 0)
 		update_wedges(pm->diskdev);
 #endif
 	return rv;
+}
 static int
 ptn_sort(const void *a, const void *b)
 @@ -678,26 +831,52 @@ ptn_sort(const void *a, const void *b)
+}
 int
 make_filesystems(void)
+{
 	unsigned int i;
 	int ptn;
 	int ptn_order[nelem(pm->bsdlabel)];
 	int error = 0;
 	unsigned int maxpart = getmaxpartitions();
 	char *newfs = NULL, *dev = NULL, *devdev = NULL;
 	partinfo *lbl;
 	if (pm->no_part) {
 		/* check if this target device already has a ffs */
 		error = fsck_preen(pm->diskdev, -1, "ffs", true);
 		if (error) {
 			if (!ask_noyes(MSG_No_filesystem_newfs))
 				return EINVAL;
 			error = run_program(RUN_DISPLAY | RUN_PROGRESS,
 			    "/sbin/newfs -V2 -O2 /dev/r%s", pm->diskdev);
+		}
 		md_pre_mount();
 		make_target_dir("/");
 		asprintf(&devdev, "/dev/%s", pm->diskdev);
 		if (devdev == NULL)
 			return (ENOMEM);
 		error = target_mount_do("-o async", devdev, "/");
 		if (error) {
 			msg_display(MSG_mountfail, devdev, ' ',
 			    "/");
 			process_menu(MENU_ok, NULL);
+		}
 		free(devdev);
 		return error;
+	}
 	if (maxpart > nelem(pm->bsdlabel))
 		maxpart = nelem(pm->bsdlabel);
 	/* Making new file systems and mounting them */
 	/* sort to ensure /usr/local is mounted after /usr (etc) */
 	for (i = 0; i < maxpart; i++)
 		ptn_order[i] = i;
 	qsort(ptn_order, maxpart, sizeof ptn_order[0], ptn_sort);
 	for (i = 0; i < maxpart; i++) {
 		/*
 		 * newfs and mount. For now, process only BSD filesystems.
 @@ -787,27 +966,27 @@ make_filesystems(void)
 					    "%s /dev/r%s",
 					    newfs, dev);
 				else {
 					run_program(RUN_SILENT | RUN_ERROR_OK,
 					    "umount /mnt2");
 					error = 0;
+				}
 			} else
 #endif
 			error = run_program(RUN_DISPLAY | RUN_PROGRESS,
 			    "%s /dev/r%s", newfs, dev);
 		} else {
 			/* We'd better check it isn't dirty */
-			error = fsck_preen(pm->diskdev, ptn, lbl->fsname);
+			error = fsck_preen(pm->diskdev, ptn, lbl->fsname, false);
+		}
 		free(newfs);
 		if (error != 0) {
 			free(devdev);
 			free(dev);
 			return error;
+		}
 		lbl->pi_flags ^= PIF_NEWFS;
 		md_pre_mount();
 		if (partman_go == 0 && lbl->pi_flags & PIF_MOUNT &&
 				lbl->mnt_opts != NULL) {
 @@ -852,26 +1031,48 @@ make_fstab(void)
 		msg_display(MSG_createfstab);
 		if (logfp)
 			(void)fprintf(logfp, "Failed to make /etc/fstab!\n");
 		process_menu(MENU_ok, NULL);
 #ifndef DEBUG
 		return 1;
 #else
 		f = stdout;
 #endif
+	}
 	scripting_fprintf(f, "# NetBSD %s/etc/fstab\n# See /usr/share/examples/"
 			"fstab/ for more examples.\n", target_prefix());
 	if (pm->no_part) {
 		/* single dk? target */
 		char buf[200], parent[200], swap[200], *prompt;
 		int res;
 		if (!get_name_and_parent(pm->diskdev, buf, parent))
 			goto done_with_disks;
 		scripting_fprintf(f, "NAME=%s\t/\tffs\trw\t\t1 1\n",
 		    buf);
 		if (!find_swap_part_on(parent, swap))
 			goto done_with_disks;
 		asprintf(&prompt, msg_string(MSG_Auto_add_swap_part),
 		    swap, parent);
 		res = ask_yesno(prompt);
 		free(prompt);
 		if (res)
 			scripting_fprintf(f, "NAME=%s\tnone"
 			    "\tswap\tsw,dp\t\t0 0\n", swap);
 		goto done_with_disks;
+	}
 	if (! partman_go) {
 		/* We want to process only one disk... */
 		pm_i = pm;
 		goto onlyonediskinfstab;
+	}
 	SLIST_FOREACH(pm_i, &pm_head, l) {
 		onlyonediskinfstab:
 		for (i = 0; i < getmaxpartitions(); i++) {
 			const char *s = "";
 			const char *mp = pm_i->bsdlabel[i].pi_mount;
 			const char *fstype = "ffs";
 			int fsck_pass = 0, dump_freq = 0;
 @@ -949,26 +1150,27 @@ make_fstab(void)
 			   pm_i->bsdlabel[i].pi_flags & PIF_NODEV ? ",nodev" : "",
 			   pm_i->bsdlabel[i].pi_flags & PIF_NODEVMTIME ? ",nodevmtime" : "",
 			   pm_i->bsdlabel[i].pi_flags & PIF_NOEXEC ? ",noexec" : "",
 			   pm_i->bsdlabel[i].pi_flags & PIF_NOSUID ? ",nosuid" : "",
 			   dump_freq, fsck_pass);
 	 		if (pm_i->isspecial)
 	 			/* Special device (such as dk*) have only one partition */
 	 			break;
+		}
 		/* Simple install, only one disk */
 		if (!partman_go)
 			break;
+	}
 done_with_disks:
 	if (tmp_ramdisk_size != 0) {
 #ifdef HAVE_TMPFS
 		scripting_fprintf(f, "tmpfs\t\t/tmp\ttmpfs\trw,-m=1777,-s=%"
 		    PRIi64 "\n",
 		    tmp_ramdisk_size * 512);
 #else
 		if (swap_dev != -1 && pm_with_swap != NULL)
 			scripting_fprintf(f, "/dev/%s%c\t\t/tmp\tmfs\trw,-s=%"
 			    PRIi64 "\n",
 			    pm_with_swap->diskdev, 'a' + swap_dev, tmp_ramdisk_size);
 		else
 			scripting_fprintf(f, "swap\t\t/tmp\tmfs\trw,-s=%"
 			    PRIi64 "\n",
 @@ -1001,27 +1203,27 @@ make_fstab(void)
 static int
 /*ARGSUSED*/
 foundffs(struct data *list, size_t num)
+{
 	int error;
 	if (num < 2 || strcmp(list[1].u.s_val, "/") == 0 ||
 	    strstr(list[2].u.s_val, "noauto") != NULL)
 		return 0;
-	error = fsck_preen(list[0].u.s_val, ' '-'a', "ffs");
+	error = fsck_preen(list[0].u.s_val, ' '-'a', "ffs", false);
 	if (error != 0)
 		return error;
 	error = target_mount("", list[0].u.s_val, ' '-'a', list[1].u.s_val);
 	if (error != 0) {
 		msg_display(MSG_mount_failed, list[0].u.s_val);
 		if (!ask_noyes(NULL))
 			return error;
+	}
 	return 0;
+}
 #ifdef USE_SYSVBFS
 @@ -1038,47 +1240,47 @@ foundsysvbfs(struct data *list, size_t n
 	error = target_mount("", list[0].u.s_val, ' '-'a', list[1].u.s_val);
 	if (error != 0)
 		return error;
 	return 0;
+}
 #endif
 /*
  * Do an fsck. On failure, inform the user by showing a warning
  * message and doing menu_ok() before proceeding.
  * Returns 0 on success, or nonzero return code from fsck() on failure.
  */
 static int
-fsck_preen(const char *disk, int ptn, const char *fsname)
+fsck_preen(const char *disk, int ptn, const char *fsname, bool silent)
+{
 	char *prog;
 	int error;
 	ptn = (ptn < 0)? 0 : 'a' + ptn;
 	if (fsname == NULL)
 		return 0;
 	/* first, check if fsck program exists, if not, assume ok */
 	asprintf(&prog, "/sbin/fsck_%s", fsname);
 	if (prog == NULL)
 		return 0;
 	if (access(prog, X_OK) != 0) {
 		free(prog);
 		return 0;
+	}
 	if (!strcmp(fsname,"ffs"))
 		fixsb(prog, disk, ptn);
-	error = run_program(0, "%s -p -q /dev/r%s%c", prog, disk, ptn);
+	error = run_program(silent? RUN_SILENT|RUN_ERROR_OK : 0, "%s -p -q /dev/r%s%c", prog, disk, ptn);
 	free(prog);
-	if (error != 0) {
+	if (error != 0 && !silent) {
 		msg_display(MSG_badfs, disk, ptn, error);
 		if (ask_noyes(NULL))
 			error = 0;
 		/* XXX at this point maybe we should run a full fsck? */
+	}
 	return error;
+}
 /* This performs the same function as the etc/rc.d/fixsb script
  * which attempts to correct problems with ffs1 filesystems
  * which may have been introduced by booting a netbsd-current kernel
  * from between April of 2003 and January 2004. For more information
  * This script was developed as a response to NetBSD pr install/25138
 @@ -1130,27 +1332,27 @@ fixsb(const char *prog, const char *disk
 	run_program(RUN_DISPLAY | RUN_PROGRESS,
 	    "%s -p -c 3 /dev/r%s%c", prog, disk, ptn);
+}
 /*
  * fsck and mount the root partition.
  */
 static int
 mount_root(void)
+{
 	int	error;
 	int ptn = (pm->isspecial)? 0 - 'a' : pm->rootpart;
-	error = fsck_preen(pm->diskdev, ptn, "ffs");
+	error = fsck_preen(pm->diskdev, ptn, "ffs", false);
 	if (error != 0)
 		return error;
 	md_pre_mount();
 	/* Mount /dev/<diskdev>a on target's "".
 	 * If we pass "" as mount-on, Prefixing will DTRT.
 	 * for now, use no options.
 	 * XXX consider -o remount in case target root is
 	 * current root, still readonly from single-user?
 	 */
 	return target_mount("", pm->diskdev, ptn, "");
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mbr.c,v 1.5 2015/05/10 10:14:02 martin Exp $ */
+/*	$NetBSD: mbr.c,v 1.6 2018/06/03 13:16:30 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
 @@ -1257,28 +1257,31 @@ int
 edit_mbr(mbr_info_t *mbri)
+{
 	struct mbr_sector *mbrs = &mbri->mbr;
 	mbr_info_t *ext;
 	struct mbr_partition *part;
 	int i, j;
 	int usefull;
 	int mbr_menu;
 	int activepart;
 	int numbsd;
 	uint bsdstart, bsdsize;
 	uint start;
-	/* Ask full/part */
+	/* If targeting a wedge, do not ask for further partitioning */
 	if (pm && pm->no_part)
 		return 1;
 	/* Ask full/part */
 	part = &mbrs->mbr_parts[0];
 	get_ptn_alignment(part);  /* update ptn_alignment */
 	if (partman_go)
 		usefull = 0;
 	else {
 		msg_display(MSG_fullpart, pm->diskdev);
 		process_menu(MENU_fullpart, &usefull);
+	}
 	/* DOS fdisk label checking and value setting. */
 	if (usefull) {
 		/* Count nonempty, non-BSD partitions. */
 		numbsd = 0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg.mi.de,v 1.6 2015/05/17 10:13:24 martin Exp $	*/
+/*	$NetBSD: msg.mi.de,v 1.7 2018/06/03 13:16:30 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
 @@ -1251,13 +1251,24 @@ message lvmlv_name_ask {Name?}
 message lvmlv_size_ask {Gr��e (MB)?}
 message lvmlv_extnum_ask {LogicalExtentsNumber?}
 message lvmlv_minor_ask {Minor-Nummer?}
 message lvmlv_mirrors_ask {Spiegel?}
 message lvmlv_regsiz_ask {MirrorLogRegionSize?}
 message lvmlv_readahsect_ask {ReadAheadSectors?}
 message lvmlv_stripes_ask {Stripes?}
 message addusername {8 character username to add}
 message addusertowheel {Do you wish to add this user to group wheel?}
 message Delete_partition
 {Partition l�schen}
 message No_filesystem_newfs
 {Die ausgew�hlte Zielpartition scheint kein g�ltiges Dateisystem zu enthalten.
 M�chten Sie ein neues erstellen (die Partition formatieren)?}
 message Auto_add_swap_part
 {Eine Auslagerungspartitons (mit Namen %s)
 scheint bereits auf der Festplatte %s zu existieren.
 M�chten Sie diese benutzen?}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg.mi.es,v 1.6 2015/05/17 10:13:24 martin Exp $	*/
+/*	$NetBSD: msg.mi.es,v 1.7 2018/06/03 13:16:30 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
 @@ -1232,13 +1232,23 @@ message lvmlv_name_ask {Nombre?}
 message lvmlv_size_ask {Tama�o (MB)?}
 message lvmlv_extnum_ask {LogicalExtentsNumber?}
 message lvmlv_minor_ask {N�mero menor de edad?}
 message lvmlv_mirrors_ask {Espejos?}
 message lvmlv_regsiz_ask {MirrorLogRegionSize?}
 message lvmlv_readahsect_ask {ReadAheadSectors?}
 message lvmlv_stripes_ask {Rayas?}
 message addusername {8 character username to add}
 message addusertowheel {Do you wish to add this user to group wheel?}
 message Delete_partition
 {Borrar partici�n}
 message No_filesystem_newfs
 {The selected partition does not seem to have a valid file system.
 Do you want to newfs (format) it?}
 message Auto_add_swap_part
 {A swap partition (named %s) seems to exist on %s.
 Do you want to use that?}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg.mi.fr,v 1.9 2015/06/19 12:27:02 youri Exp $	*/
+/*	$NetBSD: msg.mi.fr,v 1.10 2018/06/03 13:16:30 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
 @@ -1290,13 +1290,23 @@ message lvmlv_name_ask {Nom?}
 message lvmlv_size_ask {Taille (MB)?}
 message lvmlv_extnum_ask {LogicalExtentsNumber?}
 message lvmlv_minor_ask {Num�ro mineur?}
 message lvmlv_mirrors_ask {Miroirs?}
 message lvmlv_regsiz_ask {MirrorLogRegionSize?}
 message lvmlv_readahsect_ask {ReadAheadSectors?}
 message lvmlv_stripes_ask {Stripes?}
 message addusername {Nom d'utilisateur (8 caract�res)}
 message addusertowheel {Ajouter cet utilisateur au groupe "wheel" ?}
 message Delete_partition
 {Supprimer la partition}
 message No_filesystem_newfs
 {The selected partition does not seem to have a valid file system.
 Do you want to newfs (format) it?}
 message Auto_add_swap_part
 {A swap partition (named %s) seems to exist on %s.
 Do you want to use that?}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg.mi.pl,v 1.8 2015/05/17 10:13:24 martin Exp $	*/
+/*	$NetBSD: msg.mi.pl,v 1.9 2018/06/03 13:16:30 martin Exp $	*/
 /*	Based on english version: */
 /*	NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat 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
 @@ -1188,13 +1188,23 @@ message lvmlv_name_ask {Nazwa?}
 message lvmlv_size_ask {Rozmiar (MB)?}
 message lvmlv_extnum_ask {LogicalExtentsNumber?}
 message lvmlv_minor_ask {Mniejsza liczba?}
 message lvmlv_mirrors_ask {Mirrors?}
 message lvmlv_regsiz_ask {MirrorLogRegionSize?}
 message lvmlv_readahsect_ask {ReadAheadSectors?}
 message lvmlv_stripes_ask {Stripes?}
 message addusername {8 character username to add}
 message addusertowheel {Do you wish to add this user to group wheel?}
 message Delete_partition
 {Usun partycje}
 message No_filesystem_newfs
 {The selected partition does not seem to have a valid file system.
 Do you want to newfs (format) it?}
 message Auto_add_swap_part
 {A swap partition (named %s) seems to exist on %s.
 Do you want to use that?}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: md.c,v 1.8 2018/05/18 12:23:22 joerg Exp $ */
+/*	$NetBSD: md.c,v 1.9 2018/06/03 13:16:30 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.
 @@ -307,52 +307,56 @@ md_post_newfs(void)
 		"com1", /* CONSDEV_COM1 */
 		"com2", /* CONSDEV_COM2 */
 		"com3", /* CONSDEV_COM3 */
 		"com0kbd", /* CONSDEV_COM0KBD */
 		"com1kbd", /* CONSDEV_COM1KBD */
 		"com2kbd", /* CONSDEV_COM2KBD */
 		"com3kbd" /* CONSDEV_COM3KBD */ };
 	static struct x86_boot_params boottype =
 		{sizeof boottype, 0, 5, 0, 9600, { '\0' }, "", 0};
 	static int conmib[] = {CTL_MACHDEP, CPU_CONSDEV};
 	struct termios t;
 	dev_t condev;
-	/*
+	if (pm == NULL || !pm->no_part) {
-	 * Get console device, should either be ttyE0 or tty0n.
+		/*
-	 * Too hard to double check, so just 'know' the device numbers.
+		 * Get console device, should either be ttyE0 or tty0n.
-	 */
+		 * Too hard to double check, so just 'know' the device numbers.
-	len = sizeof condev;
+		 */
-	if (sysctl(conmib, nelem(conmib), &condev, &len, NULL, 0) != -1
+		len = sizeof condev;
-	    && (condev & ~3) == 0x800) {
+		if (sysctl(conmib, nelem(conmib), &condev, &len, NULL, 0) != -1
-		/* Motherboard serial port */
+		    && (condev & ~3) == 0x800) {
-		boottype.bp_consdev = (condev & 3) + 1;
+			/* Motherboard serial port */
-		/* Defaulting the baud rate to that of stdin should suffice */
+			boottype.bp_consdev = (condev & 3) + 1;
-		if (tcgetattr(0, &t) != -1)
+			/* Defaulting the baud rate to that of stdin should suffice */
-			boottype.bp_conspeed = t.c_ispeed;
+			if (tcgetattr(0, &t) != -1)
 				boottype.bp_conspeed = t.c_ispeed;
+		}
-	process_menu(MENU_getboottype, &boottype);
+		process_menu(MENU_getboottype, &boottype);
-	msg_display(MSG_dobootblks, pm->diskdev);
+		msg_display(MSG_dobootblks, pm->diskdev);
-	if (boottype.bp_consdev == ~0u)
+		if (boottype.bp_consdev == ~0u)
-		/* Use existing bootblocks */
+			/* Use existing bootblocks */
-		return 0;
+			return 0;
+	}
 	ret = cp_to_target("/usr/mdec/boot", "/boot");
 	if (ret)
 		return ret;
 	if (pm && pm->no_part)
 		return 0;
         bootxx_filename = bootxx_name();
         if (bootxx_filename != NULL) {
 		snprintf(boot_options, sizeof boot_options,
 		    "console=%s,speed=%u", consoles[boottype.bp_consdev],
 		    boottype.bp_conspeed);
 		if (pm->isspecial) {
                 	ret = run_program(RUN_DISPLAY,
                 	    "/usr/sbin/installboot -o %s /dev/r%s %s",
 			    boot_options, pm->diskdev, bootxx_filename);
 		} else {
                 	ret = run_program(RUN_DISPLAY,
                 	    "/usr/sbin/installboot -o %s /dev/r%s%c %s",
 			    boot_options, pm->diskdev, 'a' + pm->rootpart,
 			    bootxx_filename);
+		}