 @@ -1,817 +1,820 @@
-/*	$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.
  * 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.
  * 3. The name of Piermont Information Systems Inc. may not be used to endorse
  *    or promote products derived from this software without specific prior
  *    written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``AS IS''
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PIERMONT INFORMATION SYSTEMS INC. BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 /* bsddisklabel.c -- generate standard BSD disklabel */
 /* Included by appropriate arch/XXXX/md.c */
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/exec.h>
 #include <sys/utsname.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <machine/cpu.h>
 #include <stdio.h>
 #include <stddef.h>
 #include <util.h>
 #include <dirent.h>
 #include "defs.h"
 #include "md.h"
 #include "endian.h"
 #include "msg_defs.h"
 #include "menu_defs.h"
 /* For the current state of this file blame abs@NetBSD.org */
 /* Even though he wasn't the last to hack it, but he did admit doing so :-) */
 #define	PART_ANY		-1
 #define	PART_EXTRA		-2
 #define	PART_TMP_RAMDISK	-3
 /* Defaults for things that might be defined in md.h */
 #ifndef PART_ROOT
 #define PART_ROOT	PART_A
 #endif
 #ifndef PART_SWAP
 #define PART_SWAP	PART_B
 #endif
 #ifndef PART_USR
 #define PART_USR	PART_ANY
 #endif
 #ifndef DEFVARSIZE
 #define DEFVARSIZE	32
 #endif
 #ifndef DEFROOTSIZE
 #define DEFROOTSIZE	32
 #endif
 #ifndef DEFUSRSIZE
 #define DEFUSRSIZE	128
 #endif
 #ifndef DEFSWAPSIZE
 #define DEFSWAPSIZE	128
 #endif
 int
 save_ptn(int ptn, daddr_t start, daddr_t size, int fstype, const char *mountpt)
+{
 	static int maxptn;
 	partinfo *p;
 	int pp;
 	char *buf;
 	if (maxptn == 0)
 		maxptn = getmaxpartitions();
 	if (ptn < 0 || pm->bsdlabel[ptn].pi_fstype != FS_UNUSED) {
 		ptn = getrawpartition() + 1;
 #ifdef PART_FIRST_FREE
 		if (ptn < PART_FIRST_FREE)
 			ptn = PART_FIRST_FREE;
 #endif
 		for (;; ptn++) {
 			if (ptn >= maxptn)
 				return -1;
 			if (ptn == PART_USR)
 				continue;
 			if (pm->bsdlabel[ptn].pi_fstype == FS_UNUSED)
 				break;
+		}
+	}
 	if (fstype == FS_UNUSED)
 		return ptn;
 	p = pm->bsdlabel + ptn;
 	p->pi_offset = start;
 	p->pi_size = size;
 	set_ptype(p, fstype, mountpt ? PIF_NEWFS : 0);
 	/* Hack because we does not have something like FS_LVMPV */
 	p->lvmpv = 0;
 	if (mountpt != NULL && strcmp(mountpt, "lvm") == 0)
 		p->lvmpv = 1;
 	else if (mountpt != NULL) {
 		for (pp = 0; pp < maxptn; pp++) {
 			if (strcmp(pm->bsdlabel[pp].pi_mount, mountpt) == 0)
 				pm->bsdlabel[pp].pi_flags &= ~PIF_MOUNT;
+		}
 		if (mountpt[0] != '/')
 			asprintf(&buf, "/%s", mountpt);
 		else
 			asprintf(&buf, "%s", mountpt);
 		strlcpy(p->pi_mount, buf, sizeof p->pi_mount);
 		p->pi_flags |= PIF_MOUNT;
 		/* Default to UFS2. */
 		if (p->pi_fstype == FS_BSDFFS) {
 #ifdef DEFAULT_UFS2
 #ifndef HAVE_UFS2_BOOT
 			if (strcmp(mountpt, "/") != 0)
 #endif
 				p->pi_flags |= PIF_FFSv2;
 #endif
+		}
 		free(buf);
+	}
 	return ptn;
+}
 void
 set_ptn_titles(menudesc *m, int opt, void *arg)
+{
 	struct ptn_info *pi = arg;
 	struct ptn_size *p;
 	int sm = MEG / pm->sectorsize;
 	daddr_t size;
 	char inc_free[12];
 	p = &pi->ptn_sizes[opt];
 	if (p->mount[0] == 0) {
 		wprintw(m->mw, "%s", msg_string(MSG_add_another_ptn));
 		return;
+	}
 	size = p->size;
 	if (p == pi->pool_part)
 		snprintf(inc_free, sizeof inc_free, "(%" PRIi64 ")",
 		    (size + pi->free_space) / sm);
 	else
 		inc_free[0] = 0;
 	wprintw(m->mw, "%6" PRIi64 "%8s%10" PRIi64 "%10" PRIi64 " %c %s",
 		size / sm, inc_free, size / pm->dlcylsize, size,
 		p == pi->pool_part ? '+' : ' ', p->mount);
+}
 void
 set_ptn_menu(struct ptn_info *pi)
+{
 	struct ptn_size *p;
 	menu_ent *m;
 	for (m = pi->ptn_menus, p = pi->ptn_sizes;; m++, p++) {
 		m->opt_name = NULL;
 		m->opt_menu = OPT_NOMENU;
 		m->opt_flags = 0;
 		m->opt_action = set_ptn_size;
 		if (p->mount[0] == 0)
 			break;
+	}
 	if (pi->free_parts != 0)
 		m++;
 	m->opt_name = MSG_askunits;
 	m->opt_menu = MENU_sizechoice;
 	m->opt_flags = OPT_SUB;
 	m->opt_action = NULL;
 	m++;
 	if (pi->free_space >= 0)
 		snprintf(pi->exit_msg, sizeof pi->exit_msg,
 			msg_string(MSG_fssizesok),
 			(int)(pi->free_space / sizemult), multname, pi->free_parts);
 	else
 		snprintf(pi->exit_msg, sizeof pi->exit_msg,
 			msg_string(MSG_fssizesbad),
 			(int)(-pi->free_space / sizemult), multname, (uint) -pi->free_space);
 	set_menu_numopts(pi->menu_no, m - pi->ptn_menus);
+}
 int
 set_ptn_size(menudesc *m, void *arg)
+{
 	struct ptn_info *pi = arg;
 	struct ptn_size *p;
 	char answer[10];
 	char dflt[10];
 	char *cp;
 	daddr_t size, old_size;
 	int mult;
 	p = pi->ptn_sizes + m->cursel;
 	if (pi->free_parts == 0 && p->size == 0)
 		/* Don't allow 'free_parts' to go negative */
 		return 0;
 	if (p->mount[0] == 0) {
 		msg_prompt_win(partman_go?MSG_askfsmountadv:MSG_askfsmount,
 			-1, 18, 0, 0, NULL, p->mount, sizeof p->mount);
 		if (p->mount[0] == 0)
 			return 0;
+	}
 	size = p->size;
 	old_size = size;
 	if (size == 0)
 		size = p->dflt_size;
 	size /= sizemult;
 	snprintf(dflt, sizeof dflt, "%" PRIi64 "%s",
 	    size, p == pi->pool_part ? "+" : "");
 	for (;;) {
 		mult = sizemult;
 		msg_prompt_win(MSG_askfssize, -1, 18, 0, 0,
 			dflt, answer, sizeof answer,
 			p->mount, multname);
 		/* Some special cases when /usr is first given a size */
 		if (old_size == 0 && !strcmp(p->mount, "/usr")) {
 			/* Remove space for /usr from / */
 			if (!pi->ptn_sizes[0].changed) {
 				pi->ptn_sizes[0].size -= p->dflt_size;
 				pi->free_space += p->dflt_size;
 				pi->ptn_sizes[0].changed = 1;
+			}
 			/* hack to add free space to default sized /usr */
 			if (!strcmp(answer, dflt)) {
 				size = p->dflt_size;
 				pi->pool_part = p;
 				goto adjust_free;
+			}
+		}
 		size = strtoul(answer, &cp, 0);
 		switch (*cp++) {
 		default:
 			continue;
 		case 's':
 			mult = 1;
 			break;
 		case 'c':
 			mult = pm->dlcylsize;
 			break;
 		case 'm':
 		case 'M':
 			mult = MEG / pm->sectorsize;
 			break;
 		case 'g':
 		case 'G':
 			mult = 1024 * MEG / pm->sectorsize;
 			break;
 		case '+':
 			cp--;
 			if (cp != answer)
 				break;
 			mult = 1;
 			size = old_size;
 			break;
 		case 0:
 			cp--;
 			break;
+		}
 		if (*cp == 0 || *cp == '+')
 			break;
+	}
 	size = NUMSEC(size, mult, pm->dlcylsize);
 	if (p->ptn_id == PART_TMP_RAMDISK) {
 		p->size = size;
 		return 0;
+	}
 	if (p == pi->pool_part)
 		pi->pool_part = NULL;
 	if (*cp == '+' && p->limit == 0) {
 		pi->pool_part = p;
 		if (size == 0)
 			size = pm->dlcylsize;
+	}
 	if (p->limit != 0 && size > p->limit)
 		size = p->limit;
     adjust_free:
 	if (size != old_size)
 		p->changed = 1;
 	pi->free_space += old_size - size;
 	p->size = size;
 	if (size == 0) {
 		if (old_size != 0)
 			pi->free_parts++;
 		if (p->ptn_id == PART_EXTRA)
 			memmove(p, p + 1,
 				(char *)&pi->ptn_sizes[MAXPARTITIONS]
 				- (char *)p);
 	} else {
 		int f = pi->free_space;
 		if (old_size == 0)
 			pi->free_parts--;
 		if (f < mult && -f < mult) {
 			/*
 			 * Round size to end of available space,
 			 * but keep cylinder alignment
 			 */
 			if (f < 0)
 				f = -roundup(-f, pm->dlcylsize);
 			else
 				f = rounddown(f, pm->dlcylsize);
 			size += f;
 			if (size != 0) {
 				pi->free_space -= f;
 				p->size += f;
+			}
+		}
+	}
 	set_ptn_menu(pi);
 	return 0;
+}
 /* Menu to change sizes of /, /usr, /home and etc. partitions */
 void
 get_ptn_sizes(daddr_t part_start, daddr_t sectors, int no_swap)
+{
 	int i;
 	int maxpart = getmaxpartitions();
 	int sm;				/* sectors in 1MB */
 	struct ptn_size *p;
 	daddr_t size;
 	static int swap_created = 0, root_created = 0;
 	if (pm->pi.menu_no < 0)
 	pm->pi = (struct ptn_info) { -1, {
 #define PI_ROOT 0
 		{ PART_ROOT,	{ '/', '\0' },
 		  DEFROOTSIZE,	DEFROOTSIZE , 0, 0},
 #define PI_SWAP 1
 		{ PART_SWAP,	{ 's', 'w', 'a', 'p', '\0' },
 	 	  DEFSWAPSIZE,	DEFSWAPSIZE, 0, 0 },
 		{ PART_TMP_RAMDISK,
 #ifdef HAVE_TMPFS
 		  { '/', 't', 'm', 'p', ' ', '(', 't', 'm', 'p', 'f', 's', ')', '\0' },
 #else
 		  { '/', 't', 'm', 'p', ' ', '(', 'm', 'f', 's', ')', '\0' },
 #endif
 , 0, 0, 0 },
 #define PI_USR 3
 		{ PART_USR,	{ '/', 'u', 's', 'r', '\0' },	DEFUSRSIZE,
 , 0, 0 },
 		{ PART_ANY,	{ '/', 'v', 'a', 'r', '\0' },	DEFVARSIZE,
 , 0, 0 },
 		{ PART_ANY,	{ '/', 'h', 'o', 'm', 'e', '\0' },	0,
 , 0, 0 },
 	}, {
 		{ NULL, OPT_NOMENU, 0, set_ptn_size },
 		{ MSG_askunits, MENU_sizechoice, OPT_SUB, NULL },
 	}, 0, 0, NULL, { 0 } };
 	if (maxpart > MAXPARTITIONS)
 		maxpart = MAXPARTITIONS;	/* sanity */
 	msg_display(MSG_ptnsizes);
 	msg_table_add(MSG_ptnheaders);
 	if (pm->pi.menu_no < 0) {
 		/* If there is a swap partition elsewhere, don't add one here.*/
 		if (no_swap || (swap_created && partman_go)) {
 			pm->pi.ptn_sizes[PI_SWAP].size = 0;
 		} else {
 #if DEFSWAPSIZE == -1
 			/* Dynamic swap size. */
 			pm->pi.ptn_sizes[PI_SWAP].dflt_size = get_ramsize();
 			pm->pi.ptn_sizes[PI_SWAP].size =
 			    pm->pi.ptn_sizes[PI_SWAP].dflt_size;
 #endif
+		}
 		/* If installing X increase default size of /usr */
 		if (set_X11_selected())
 			pm->pi.ptn_sizes[PI_USR].dflt_size += XNEEDMB;
 		/* Start of planning to give free space to / */
 		pm->pi.pool_part = &pm->pi.ptn_sizes[PI_ROOT];
 		/* Make size of root include default size of /usr */
 		pm->pi.ptn_sizes[PI_ROOT].size += pm->pi.ptn_sizes[PI_USR].dflt_size;
 		sm = MEG / pm->sectorsize;
 		if (root_limit != 0) {
 			/* Bah - bios can not read all the disk, limit root */
 			pm->pi.ptn_sizes[PI_ROOT].limit = root_limit - part_start;
 			/* Allocate a /usr partition if bios can't read
 			 * everything except swap.
 			 */
 			if (pm->pi.ptn_sizes[PI_ROOT].limit
 			    < sectors - pm->pi.ptn_sizes[PI_SWAP].size * sm) {
 				/* Root won't be able to access all the space */
 				/* Claw back space for /usr */
 				pm->pi.ptn_sizes[PI_USR].size =
 						pm->pi.ptn_sizes[PI_USR].dflt_size;
 				pm->pi.ptn_sizes[PI_ROOT].size -=
 						pm->pi.ptn_sizes[PI_USR].dflt_size;
 				pm->pi.ptn_sizes[PI_ROOT].changed = 1;
 				/* Give free space to /usr */
 				pm->pi.pool_part = &pm->pi.ptn_sizes[PI_USR];
+			}
+		}
 		/* Change preset sizes from MB to sectors */
 		pm->pi.free_space = sectors;
 		for (p = pm->pi.ptn_sizes; p->mount[0]; p++) {
 			p->size = NUMSEC(p->size, sm, pm->dlcylsize);
 			p->dflt_size = NUMSEC(p->dflt_size, sm, pm->dlcylsize);
 			pm->pi.free_space -= p->size;
+		}
 		/* Steal space from swap to make things fit.. */
 		if (pm->pi.free_space < 0) {
 			i = roundup(-pm->pi.free_space, pm->dlcylsize);
 			if (i > pm->pi.ptn_sizes[PI_SWAP].size)
 				i = pm->pi.ptn_sizes[PI_SWAP].size;
 			pm->pi.ptn_sizes[PI_SWAP].size -= i;
 			pm->pi.free_space += i;
+		}
 		/* Add space for 2 system dumps to / (traditional) */
 		i = get_ramsize() * sm;
 		i = roundup(i, pm->dlcylsize);
 		if (pm->pi.free_space > i * 2)
 			i *= 2;
 		if (pm->pi.free_space > i) {
 			pm->pi.ptn_sizes[PI_ROOT].size += i;
 			pm->pi.free_space -= i;
+		}
 		if (root_created && partman_go) {
 			pm->pi.ptn_sizes[PI_ROOT].size = 0;
 			pm->pi.pool_part = 0;
+		}
 		/* Ensure all of / is readable by the system boot code */
 		i = pm->pi.ptn_sizes[PI_ROOT].limit;
 		if (i != 0 && (i -= pm->pi.ptn_sizes[PI_ROOT].size) < 0) {
 			pm->pi.ptn_sizes[PI_ROOT].size += i;
 			pm->pi.free_space -= i;
+		}
 		/* Count free partition slots */
 		pm->pi.free_parts = 0;
 		for (i = 0; i < maxpart; i++) {
 			if (pm->bsdlabel[i].pi_size == 0)
 				pm->pi.free_parts++;
+		}
 		for (i = 0; i < MAXPARTITIONS; i++) {
 			p = &pm->pi.ptn_sizes[i];
 			if (i != 0 && p->ptn_id == 0)
 				p->ptn_id = PART_EXTRA;
 			if (p->size != 0)
 				pm->pi.free_parts--;
+		}
 		pm->pi.menu_no = new_menu(0, pm->pi.ptn_menus, nelem(pm->pi.ptn_menus),
 , -1, 12, 70,
 			MC_ALWAYS_SCROLL | MC_NOBOX | MC_NOCLEAR,
 			NULL, set_ptn_titles, NULL,
 			"help", pm->pi.exit_msg);
 		if (pm->pi.menu_no < 0)
 			return;
+	}
 	do {
 		set_ptn_menu(&pm->pi);
 		pm->current_cylsize = pm->dlcylsize;
 		process_menu(pm->pi.menu_no, &pm->pi);
 	} while (pm->pi.free_space < 0 || pm->pi.free_parts < 0);
 	/* Give any cylinder fragment to last partition */
 	if (pm->pi.pool_part != NULL || pm->pi.free_space < pm->dlcylsize) {
 		for (p = pm->pi.ptn_sizes + nelem(pm->pi.ptn_sizes) - 1; ;p--) {
 			if (p->size == 0) {
 				if (p == pm->pi.ptn_sizes)
 					break;
 				continue;
+			}
 			if (p->ptn_id == PART_TMP_RAMDISK)
 				continue;
 			p->size += pm->pi.free_space % pm->dlcylsize;
 			pm->pi.free_space -= pm->pi.free_space % pm->dlcylsize;
 			break;
+		}
+	}
 	for (p = pm->pi.ptn_sizes; p->mount[0]; p++, part_start += size) {
 		size = p->size;
 		if (p == pm->pi.pool_part) {
 			size += rounddown(pm->pi.free_space, pm->dlcylsize);
 			if (p->limit != 0 && size > p->limit)
 				size = p->limit;
+		}
 		i = p->ptn_id;
 		if (i == PART_TMP_RAMDISK) {
 			tmp_ramdisk_size = size;
 			size = 0;
 			continue;
+		}
 		if (size == 0)
 			continue;
 		if (i == PART_ROOT && size > 0)
 			root_created = 1;
 		if (i == PART_SWAP) {
 			if (size > 0)
 				swap_created = 1;
 			save_ptn(i, part_start, size, FS_SWAP, NULL);
 			continue;
+		}
 		if (!strcmp(p->mount, "raid")) {
 			save_ptn(i, part_start, size, FS_RAID, NULL);
 			continue;
 		} else if (!strcmp(p->mount, "cgd")) {
 			save_ptn(i, part_start, size, FS_CGD, NULL);
 			continue;
+		}
 		save_ptn(i, part_start, size, FS_BSDFFS, p->mount);
+	}
+}
 /*
  * md back-end code for menu-driven BSD disklabel editor.
  */
 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);
 	partstart = pm->ptstart;
 	ptend = pm->ptstart + pm->ptsize;
 	/* Ask for layout type -- standard or special */
 	if (partman_go == 0) {
 		msg_display(MSG_layout,
 		    (int) (pm->ptsize / (MEG / pm->sectorsize)),
 		    DEFROOTSIZE + DEFSWAPSIZE + DEFUSRSIZE,
 		    DEFROOTSIZE + DEFSWAPSIZE + DEFUSRSIZE + XNEEDMB);
 		process_menu(MENU_layout, NULL);
+	}
 	/* Set so we use the 'real' geometry for rounding, input in MB */
 	pm->current_cylsize = pm->dlcylsize;
 	set_sizemultname_meg();
 	/* Build standard partitions */
 	memset(&pm->bsdlabel, 0, sizeof pm->bsdlabel);
 	/* Set initial partition types to unused */
 	for (part = 0 ; part < maxpart ; ++part)
 		pm->bsdlabel[part].pi_fstype = FS_UNUSED;
 	/* Whole disk partition */
 	part_raw = getrawpartition();
 	if (part_raw == -1)
 		part_raw = PART_C;	/* for sanity... */
 	pm->bsdlabel[part_raw].pi_offset = 0;
 	pm->bsdlabel[part_raw].pi_size = pm->dlsize;
 	if (part_raw == PART_D) {
 		/* Probably a system that expects an i386 style mbr */
 		part_bsd = PART_C;
 		pm->bsdlabel[PART_C].pi_offset = pm->ptstart;
 		pm->bsdlabel[PART_C].pi_size = pm->ptsize;
 	} else {
 		part_bsd = part_raw;
+	}
 #if defined(PART_BOOT) && defined(BOOT_SIZE)
 	i = BOOT_SIZE;
 	if (i >= 1024) {
 		/* Treat big numbers as a byte count */
 		i = (i + pm->dlcylsize * pm->sectorsize - 1) / (pm->dlcylsize * pm->sectorsize);
 		i *= pm->dlcylsize;
+	}
 #if defined(PART_BOOT_FFS)
 	pm->bsdlabel[PART_BOOT].pi_fstype = FS_BSDFFS;
 	pm->bsdlabel[PART_BOOT].pi_flags = PIF_NEWFS;
 #else
 	pm->bsdlabel[PART_BOOT].pi_fstype = FS_BOOT;
 #endif
 	pm->bsdlabel[PART_BOOT].pi_size = i;
 #ifdef BOOT_HIGH
 	pm->bsdlabel[PART_BOOT].pi_offset = ptend - i;
 	ptend -= i;
 #else
 	pm->bsdlabel[PART_BOOT].pi_offset = pm->ptstart;
 	partstart += i;
 #endif
 #elif defined(PART_BOOT)
 	if (pm->bootsize != 0) {
 #if defined(PART_BOOT_MSDOS)
 		pm->bsdlabel[PART_BOOT].pi_fstype = FS_MSDOS;
 #else
 		pm->bsdlabel[PART_BOOT].pi_fstype = FS_BOOT;
 #endif
 		pm->bsdlabel[PART_BOOT].pi_size = pm->bootsize;
 		pm->bsdlabel[PART_BOOT].pi_offset = pm->bootstart;
 #if defined(PART_BOOT_PI_FLAGS)
 		pm->bsdlabel[PART_BOOT].pi_flags |= PART_BOOT_PI_FLAGS;
 #endif
 #if defined(PART_BOOT_PI_MOUNT)
 		strlcpy(pm->bsdlabel[PART_BOOT].pi_mount, PART_BOOT_PI_MOUNT,
 		    sizeof pm->bsdlabel[PART_BOOT].pi_mount);
 #endif
+	}
 #endif /* PART_BOOT w/o BOOT_SIZE */
 #if defined(PART_SYSVBFS) && defined(SYSVBFS_SIZE)
 	pm->bsdlabel[PART_SYSVBFS].pi_offset = partstart;
 	pm->bsdlabel[PART_SYSVBFS].pi_fstype = FS_SYSVBFS;
 	pm->bsdlabel[PART_SYSVBFS].pi_size = SYSVBFS_SIZE;
 	pm->bsdlabel[PART_SYSVBFS].pi_flags |= PIF_NEWFS | PIF_MOUNT;
 	strlcpy(pm->bsdlabel[PART_SYSVBFS].pi_mount, "/stand",
 	    sizeof pm->bsdlabel[PART_SYSVBFS].pi_mount);
 	partstart += SYSVBFS_SIZE;
 #endif
 #ifdef PART_REST
 	pm->bsdlabel[PART_REST].pi_offset = 0;
 	pm->bsdlabel[PART_REST].pi_size = pm->ptstart;
 #endif
 	if (layoutkind == LY_USEEXIST) {
 		/*
 		 * If 'pm->oldlabel' is a default label created by the kernel it
 		 * will have exactly one valid partition besides raw_part
 		 * which covers the whole disk - but might lie outside the
 		 * mbr partition we (by now) have offset by a few sectors.
 		 * Check for this and and fix ut up.
 		 */
 		valid_part = -1;
 		for (i = 0; i < maxpart; i++) {
 			if (i == part_raw)
 				continue;
 			if (pm->oldlabel[i].pi_size > 0 && PI_ISBSDFS(&pm->oldlabel[i])) {
 				if (valid_part >= 0) {
 					/* nope, not the default case */
 					valid_part = -1;
 					break;
+				}
 				valid_part = i;
+			}
+		}
 		if (valid_part >= 0 && pm->oldlabel[valid_part].pi_offset < pm->ptstart) {
 			pm->oldlabel[valid_part].pi_offset = pm->ptstart;
 			pm->oldlabel[valid_part].pi_size -= pm->ptstart;
+		}
+	}
 	/*
 	 * Save any partitions that are outside the area we are
 	 * going to use.
 	 * In particular this saves details of the other MBR
 	 * partitions on a multiboot i386 system.
 	 */
 	 for (i = maxpart; i--;) {
 		if (pm->bsdlabel[i].pi_size != 0)
 			/* Don't overwrite special partitions */
 			continue;
 		p = &pm->oldlabel[i];
 		if (p->pi_fstype == FS_UNUSED || p->pi_size == 0)
 			continue;
 		if (layoutkind == LY_USEEXIST) {
 			if (PI_ISBSDFS(p)) {
 				p->pi_flags |= PIF_MOUNT;
 				if (layoutkind == LY_USEEXIST && i == valid_part) {
 					int fstype = p->pi_fstype;
 					p->pi_fstype = 0;
 					strcpy(p->pi_mount, "/");
 					set_ptype(p, fstype, PIF_NEWFS);
+				}
+			}
 		} else {
 			if (p->pi_offset < pm->ptstart + pm->ptsize &&
 			    p->pi_offset + p->pi_size > pm->ptstart)
 				/* Not outside area we are allocating */
 				continue;
 			if (p->pi_fstype == FS_SWAP)
 				no_swap = 1;
+		}
 		pm->bsdlabel[i] = pm->oldlabel[i];
+	 }
 	if (layoutkind == LY_SETNEW)
 		get_ptn_sizes(partstart, ptend - partstart, no_swap);
 	else if (layoutkind == LY_NEWRAID) {
 		set_ptype(&(pm->bsdlabel[PART_E]), FS_RAID, 0);
 		pm->bsdlabel[PART_E].pi_size = pm->ptsize;
+	}
 	else if (layoutkind == LY_NEWCGD) {
 		set_ptype(&(pm->bsdlabel[PART_E]), FS_CGD, 0);
 		pm->bsdlabel[PART_E].pi_size = pm->ptsize;
+	}
 	else if (layoutkind == LY_NEWLVM) {
 		set_ptype(&(pm->bsdlabel[PART_E]), FS_BSDFFS, 0);
 		pm->bsdlabel[PART_E].pi_size = pm->ptsize;
 		pm->bsdlabel[PART_E].lvmpv = 1;
+	}
 	/*
 	 * OK, we have a partition table. Give the user the chance to
 	 * edit it and verify it's OK, or abort altogether.
 	 */
  	do {
 		if (edit_and_check_label(pm->bsdlabel, maxpart, part_raw, part_bsd) == 0) {
 			msg_display(MSG_abort);
 			memcpy(&pm->bsdlabel, &savedlabel, sizeof pm->bsdlabel);
 			return 0;
+		}
 	} while (partman_go == 0 && check_partitions() == 0);
 	/* Disk name */
 	if (!partman_go)
 		msg_prompt(MSG_packname, pm->bsddiskname, pm->bsddiskname,
 			sizeof pm->bsddiskname);
 	/* save label to disk for MI code to update. */
 	if (! partman_go)
 		(void) savenewlabel(pm->bsdlabel, maxpart);
 	/* Everything looks OK. */
 	return (1);
+}
 /*
  * check that there is at least a / somewhere.
  */
 int
 check_partitions(void)
+{
 #ifdef HAVE_BOOTXX_xFS
 	int rv = 1;
 	char *bootxx;
 #endif
 #ifndef HAVE_UFS2_BOOT
 	int fstype;
 #endif
 #ifdef HAVE_BOOTXX_xFS
 	/* check if we have boot code for the root partition type */
 	bootxx = bootxx_name();
 	if (bootxx != NULL) {
 		rv = access(bootxx, R_OK);
 		free(bootxx);
 	} else
 		rv = -1;
 	if (rv != 0) {
 		process_menu(MENU_ok, __UNCONST(MSG_No_Bootcode));
 		return 0;
+	}
 #endif
 #ifndef HAVE_UFS2_BOOT
 	fstype = pm->bsdlabel[pm->rootpart].pi_fstype;
 	if (fstype == FS_BSDFFS &&
 	    (pm->bsdlabel[pm->rootpart].pi_flags & PIF_FFSv2) != 0) {
 		process_menu(MENU_ok, __UNCONST(MSG_cannot_ufs2_root));
 		return 0;
+	}
 #endif
 	return md_check_partitions();
+}

 @@ -1,639 +1,640 @@
-/*	$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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of Piermont Information Systems Inc. may not be used to endorse
  *    or promote products derived from this software without specific prior
  *    written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``AS IS''
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PIERMONT INFORMATION SYSTEMS INC. BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 #ifndef _DEFS_H_
 #define _DEFS_H_
 /* defs.h -- definitions for use in the sysinst program. */
 /* System includes needed for this. */
 #include <sys/queue.h>
 #include <sys/types.h>
 #include <sys/disklabel.h>
 #include <sys/disk.h>
 const char *getfslabelname(uint8_t);
 #include "msg_defs.h"
 #include "menu_defs.h"
 #define min(a,b)	((a) < (b) ? (a) : (b))
 #define max(a,b)	((a) > (b) ? (a) : (b))
 /* constants */
 #define MEG (1024 * 1024)
 #define STRSIZE 255
 #define SSTRSIZE 30
 /* For run.c: collect() */
 #define T_FILE		0
 #define T_OUTPUT	1
 /* Some install status/response values */
 #define	SET_OK		0		/* Set extracted */
 #define	SET_RETRY	1		/* Retry */
 #define	SET_SKIP	2		/* Skip this set */
 #define	SET_SKIP_GROUP	3		/* Skip this set and rest of group */
 #define	SET_ABANDON	4		/* Abandon installation */
 #define	SET_CONTINUE	5		/* Continue (copy from floppy loop) */
 /* run_prog flags */
 #define RUN_DISPLAY	0x0001		/* Display program output */
 #define RUN_FATAL	0x0002		/* errors are fatal */
 #define RUN_CHROOT	0x0004		/* chroot to target disk */
 #define RUN_FULLSCREEN	0x0008		/* fullscreen (use with RUN_DISPLAY) */
 #define RUN_SILENT	0x0010		/* Do not show output */
 #define RUN_ERROR_OK	0x0040		/* Don't wait for error confirmation */
 #define RUN_PROGRESS	0x0080		/* Output is just progess test */
 #define RUN_NO_CLEAR	0x0100		/* Leave program output after error */
 #define RUN_XFER_DIR	0x0200		/* cd to xfer_dir in child */
 /* for bsddisklabel.c */
 enum { LY_SETNEW, LY_NEWRAID, LY_NEWCGD, LY_NEWLVM, LY_USEEXIST };
 /* Installation sets */
 enum {
     SET_NONE,
     SET_KERNEL_FIRST,
     SET_KERNEL_1,	/* Usually GENERIC */
     SET_KERNEL_2,	/* MD kernel... */
     SET_KERNEL_3,	/* MD kernel... */
     SET_KERNEL_4,	/* MD kernel... */
     SET_KERNEL_5,	/* MD kernel... */
     SET_KERNEL_6,	/* MD kernel... */
     SET_KERNEL_7,	/* MD kernel... */
     SET_KERNEL_8,	/* MD kernel... */
     SET_KERNEL_9,	/* MD kernel... */
     SET_KERNEL_LAST,	/* allow 9 kernels */
     /* System sets */
     SET_BASE,		/* base */
     SET_ETC,		/* /etc */
     SET_COMPILER,	/* compiler tools */
     SET_GAMES,		/* text games */
     SET_MAN_PAGES,	/* online manual pages */
     SET_MISC,		/* miscellaneuous */
     SET_MODULES,	/* kernel modules */
     SET_TESTS,		/* tests */
     SET_TEXT_TOOLS,	/* text processing tools */
     /* X11 sets */
     SET_X11_FIRST,
     SET_X11_BASE,	/* X11 base and clients */
     SET_X11_FONTS,	/* X11 fonts */
     SET_X11_SERVERS,	/* X11 servers */
     SET_X11_PROG,	/* X11 programming */
     SET_X11_ETC,	/* X11 config */
     SET_X11_LAST,
     /* Machine dependent sets */
     SET_MD_1,		/* Machine dependent set */
     SET_MD_2,		/* Machine dependent set */
     SET_MD_3,		/* Machine dependent set */
     SET_MD_4,		/* Machine dependent set */
     /* Source sets */
     SET_SYSSRC,
     SET_SRC,
     SET_SHARESRC,
     SET_GNUSRC,
     SET_XSRC,
     /* Debug sets */
     SET_DEBUG,
     SET_X11_DEBUG,
     SET_LAST,
     SET_GROUP,		/* Start of submenu */
     SET_GROUP_END,	/* End of submenu */
     SET_PKGSRC,		/* pkgsrc, not counted as regular set */
 };
 /* Initialisers to select sets */
 /* All kernels */
 #define SET_KERNEL SET_KERNEL_1, SET_KERNEL_2, SET_KERNEL_3, SET_KERNEL_4, \
 		    SET_KERNEL_5, SET_KERNEL_6, SET_KERNEL_7, SET_KERNEL_8
 /* Core system sets */
 #define SET_CORE SET_MODULES, SET_BASE, SET_ETC
 /* All system sets */
 #define SET_SYSTEM SET_CORE, SET_COMPILER, SET_GAMES, \
 		    SET_MAN_PAGES, SET_MISC, SET_TESTS, SET_TEXT_TOOLS
 /* All X11 sets */
 #define SET_X11_NOSERVERS SET_X11_BASE, SET_X11_FONTS, SET_X11_PROG, SET_X11_ETC
 #define SET_X11 SET_X11_NOSERVERS, SET_X11_SERVERS
 /* All machine dependent sets */
 #define SET_MD SET_MD_1, SET_MD_2, SET_MD_3, SET_MD_4
 /* All source sets */
 #define SET_SOURCE SET_SYSSRC, SET_SRC, SET_SHARESRC, SET_GNUSRC, SET_XSRC
 /* All debug sets */
 #define SET_DEBUGGING SET_DEBUG, SET_X11_DEBUG
 /* Set list flags */
 #define SFLAG_MINIMAL	1
 #define	SFLAG_NOX	2
 /* Macros */
 #define nelem(x) (sizeof (x) / sizeof *(x))
 /* Round up to the next full cylinder size */
 #define NUMSEC(size, sizemult, cylsize) \
 	((size) == ~0u ? ~0u : (sizemult) == 1 ? (size) : \
 	 roundup((size) * (sizemult), (cylsize)))
 /* What FS type? */
 #define PI_ISBSDFS(p) ((p)->pi_fstype == FS_BSDLFS || \
 		       (p)->pi_fstype == FS_BSDFFS)
 /* standard cd0 device */
 #define CD_NAMES "cd0a"
 /* Types */
 /* pass a void* argument into a menu and also provide a int return value */
 typedef struct arg_rv {
 	void *arg;
 	int rv;
 } arg_rv;
 typedef struct distinfo {
 	const char	*name;
 	uint		set;
 	const char	*desc;
 	const char	*marker_file;	/* set assumed installed if exists */
 } distinfo;
 #define MOUNTLEN 20
 typedef struct _partinfo {
 	struct partition pi_partition;
 #define pi_size		pi_partition.p_size
 #define pi_offset	pi_partition.p_offset
 #define pi_fsize	pi_partition.p_fsize
 #define pi_fstype	pi_partition.p_fstype
 #define pi_frag		pi_partition.p_frag
 #define pi_cpg		pi_partition.p_cpg
 	char	pi_mount[MOUNTLEN];
 	uint	pi_isize;		/* bytes per inode (for # inodes) */
 	uint	pi_flags;
 #define PIF_NEWFS	0x0001		/* need to 'newfs' partition */
 #define PIF_FFSv2	0x0002		/* newfs with FFSv2, not FFSv1 */
 #define PIF_MOUNT	0x0004		/* need to mount partition */
 #define PIF_ASYNC	0x0010		/* mount -o async */
 #define PIF_NOATIME	0x0020		/* mount -o noatime */
 #define PIF_NODEV	0x0040		/* mount -o nodev */
 #define PIF_NODEVMTIME	0x0080		/* mount -o nodevmtime */
 #define PIF_NOEXEC	0x0100		/* mount -o noexec */
 #define PIF_NOSUID	0x0200		/* mount -o nosuid */
 #define PIF__UNUSED	0x0400		/* unused */
 #define PIF_LOG		0x0800		/* mount -o log */
 #define PIF_MOUNT_OPTS	0x0ff0		/* all above mount flags */
 #define PIF_RESET	0x1000		/* internal - restore previous values */
     const char *mnt_opts;
     const char *fsname;
     char mounted[MOUNTLEN];
     int lvmpv; /* should we use partition as LVM PV? */
 } partinfo;	/* Single partition from a disklabel */
 struct ptn_info {
 	int		menu_no;
 	struct ptn_size {
 		int	ptn_id;
 		char	mount[MOUNTLEN];
 		daddr_t	dflt_size;
 		daddr_t	size;
 		int	limit;
 		int	changed;
 	}		ptn_sizes[MAXPARTITIONS + 1];	/* +1 for delete code */
 	menu_ent	ptn_menus[MAXPARTITIONS + 1];	/* +1 for unit chg */
 	int		free_parts;
 	daddr_t		free_space;
 	struct ptn_size	*pool_part;
 	char		exit_msg[70];
 };
 /* variables */
 int debug;		/* set by -D option */
 char rel[SSTRSIZE];
 char machine[SSTRSIZE];
 int ignorerror;
 int ttysig_ignore;
 pid_t ttysig_forward;
 int layoutkind;
 int sizemult;
 const char *multname;
 int partman_go; /* run extended partition manager */
 /* logging variables */
 FILE *logfp;
 FILE *script;
 /* Information for the NetBSD disklabel */
 enum DLTR { PART_A, PART_B, PART_C, PART_D, PART_E, PART_F, PART_G, PART_H,
 	    PART_I, PART_J, PART_K, PART_L, PART_M, PART_N, PART_O, PART_P};
 #define partition_name(x)	('a' + (x))
 daddr_t tmp_ramdisk_size;
 #define MAX_DISKS 15
 unsigned int root_limit;    /* BIOS (etc) read limit */
 enum SHRED_T { SHRED_NONE=0, SHRED_ZEROS, SHRED_RANDOM, SHRED_CRYPTO };
 /* All information that is unique for each drive */
 SLIST_HEAD(pm_head_t, pm_devs_t) pm_head;
 typedef struct pm_devs_t {
     int unsaved; /* Flag indicating to partman that device need saving */
     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;
 pm_devs_t *pm; /* Pointer to currend device with which we work */
 pm_devs_t *pm_new; /* Pointer for next allocating device in find_disks() */
 #define MAX_WEDGES 16 /* num of dk* devices */
 typedef struct pm_wedge_t {
     int allocated;
     int todel;
     pm_devs_t *pm;
     int ptn;
 } pm_wedge_t;
 pm_wedge_t wedges[MAX_WEDGES];
 /* Generic structure for partman */
 typedef struct {
     int retvalue;
     int dev_num;
     int wedge_num;
     void *dev_ptr;
     int dev_ptr_delta;
     char fullname[SSTRSIZE];
     enum {PM_DISK_T=1, PM_PART_T, PM_WEDGE_T, PM_SPEC_T, PM_RAID_T, PM_CGD_T,
         PM_VND_T, PM_LVM_T, PM_LVMLV_T} type;
 } part_entry_t;
 /* Relative file name for storing a distribution. */
 char xfer_dir[STRSIZE];
 int  clean_xfer_dir;
 #if !defined(SYSINST_FTP_HOST)
 #define SYSINST_FTP_HOST	"ftp.NetBSD.org"
 #endif
 #if !defined(SYSINST_FTP_DIR)
 #define SYSINST_FTP_DIR		"pub/NetBSD/NetBSD-" REL
 #endif
 #if !defined(SYSINST_PKG_HOST)
 #define SYSINST_PKG_HOST	SYSINST_FTP_HOST
 #endif
 #if !defined(SYSINST_PKG_DIR)
 #define SYSINST_PKG_DIR		"pub/pkgsrc/packages/NetBSD"
 #endif
 #if !defined(SYSINST_PKGSRC_HOST)
 #define SYSINST_PKGSRC_HOST	SYSINST_PKG_HOST
 #endif
 /* Abs. path we extract binary sets from */
 char ext_dir_bin[STRSIZE];
 /* Abs. path we extract source sets from */
 char ext_dir_src[STRSIZE];
 /* Abs. path we extract pkgsrc from */
 char ext_dir_pkgsrc[STRSIZE];
 /* Place we look for binary sets in all fs types */
 char set_dir_bin[STRSIZE];
 /* Place we look for source sets in all fs types */
 char set_dir_src[STRSIZE];
 /* Place we look for pkgs in all fs types */
 char pkg_dir[STRSIZE];
 /* Place we look for pkgsrc in all fs types */
 char pkgsrc_dir[STRSIZE];
 /* User shell */
 const char *ushell;
 struct ftpinfo {
     char host[STRSIZE];
     char dir[STRSIZE] ;
     char user[SSTRSIZE];
     char pass[STRSIZE];
     char proxy[STRSIZE];
     const char *xfer_type;		/* "ftp" or "http" */
 };
 /* use the same struct for sets ftp and to build pkgpath */
 struct ftpinfo ftp, pkg, pkgsrc;
 int (*fetch_fn)(const char *);
 char nfs_host[STRSIZE];
 char nfs_dir[STRSIZE];
 char cdrom_dev[SSTRSIZE];		/* Typically "cd0a" */
 char fd_dev[SSTRSIZE];			/* Typically "/dev/fd0a" */
 const char *fd_type;			/* "msdos", "ffs" or maybe "ados" */
 char localfs_dev[SSTRSIZE];
 char localfs_fs[SSTRSIZE];
 char localfs_dir[STRSIZE];
 char targetroot_mnt[SSTRSIZE];
 int  mnt2_mounted;
 char dist_postfix[SSTRSIZE];
 /* needed prototypes */
 void set_menu_numopts(int, int);
 void remove_color_options(void);
 void remove_raid_options(void);
 void remove_lvm_options(void);
 void remove_cgd_options(void);
 void remove_gpt_options(void);
 /* Machine dependent functions .... */
 void	md_init(void);
 void	md_prelim_menu(void);
 void	md_init_set_status(int); /* SFLAG_foo */
  /* MD functions if user selects install - in order called */
 int	md_get_info(void);
 int	md_make_bsd_partitions(void);
 int	md_check_partitions(void);
 int	md_pre_disklabel(void);
 int	md_post_disklabel(void);
 int	md_pre_mount(void);
 int	md_post_newfs(void);
 int	md_post_extract(void);
 void	md_cleanup_install(void);
  /* MD functions if user selects upgrade - in order called */
 int	md_pre_update(void);
 int	md_update(void);
 /* Also calls md_post_extract() */
 /* from main.c */
 void	toplevel(void);
 /* from disks.c */
 const char *get_default_cdrom(void);
 int	find_disks(const char *);
 struct menudesc;
 void	fmt_fspart(struct menudesc *, int, void *);
 void	disp_cur_fspart(int, int);
 int	write_disklabel(void);
 int	make_filesystems(void);
 int	make_fstab(void);
 int	mount_disks(void);
 int	set_swap_if_low_ram(const char *, partinfo *);
 int	set_swap(const char *, partinfo *);
 int	check_swap(const char *, int);
 char *bootxx_name(void);
 void label_read(void);
 int get_dkwedges(struct dkwedge_info **, const char *);
 const char *get_gptfs_by_id(int);
 /* from disks_lfs.c */
 int	fs_is_lfs(void *);
 /* from label.c */
 const char *get_last_mounted(int, int, partinfo *);
 int	savenewlabel(partinfo *, int);
 int	incorelabel(const char *, partinfo *);
 int	edit_and_check_label(partinfo *, int, int, int);
 void	set_bsize(partinfo *, int);
 void	set_fsize(partinfo *, int);
 void	set_ptype(partinfo *, int, int);
 int edit_ptn(menudesc *, void *);
 int checkoverlap(partinfo *, int, int, int);
 /* from install.c */
 void	do_install(void);
 /* from factor.c */
 void	factor(long, long *, int, int *);
 /* from fdisk.c */
 void	get_disk_info(char *);
 void	set_disk_info(char *);
 /* from geom.c */
 int	get_geom(const char *, struct disklabel *);
 int	get_real_geom(const char *, struct disklabel *);
 /* from net.c */
 extern int network_up;
 extern char net_namesvr[STRSIZE];
 int	get_via_ftp(const char *);
 int	get_via_nfs(void);
 int	config_network(void);
 void	mnt_net_config(void);
 void	make_url(char *, struct ftpinfo *, const char *);
 int	get_pkgsrc(void);
 /* From run.c */
 int	collect(int, char **, const char *, ...) __printflike(3, 4);
 int	run_program(int, const char *, ...) __printflike(2, 3);
 void	do_logging(void);
 int	do_system(const char *);
 /* from upgrade.c */
 void	do_upgrade(void);
 void	do_reinstall_sets(void);
 void	restore_etc(void);
 /* from util.c */
 int	ask_yesno(const char *);
 int	ask_noyes(const char *);
 int	dir_exists_p(const char *);
 int	file_exists_p(const char *);
 int	file_mode_match(const char *, unsigned int);
 uint	get_ramsize(void);
 void	ask_sizemult(int);
 void	run_makedev(void);
 int	boot_media_still_needed(void);
 int	get_via_floppy(void);
 int	get_via_cdrom(void);
 int	get_via_localfs(void);
 int	get_via_localdir(void);
 void	show_cur_distsets(void);
 void	make_ramdisk_dir(const char *);
 void    set_kernel_set(unsigned int);
 unsigned int    get_kernel_set(void);
 unsigned int    set_X11_selected(void);
 int 	get_and_unpack_sets(int, msg, msg, msg);
 int	sanity_check(void);
 int	set_timezone(void);
 void	scripting_fprintf(FILE *, const char *, ...) __printflike(2, 3);
 void	scripting_vfprintf(FILE *, const char *, va_list) __printflike(2, 0);
 void	add_rc_conf(const char *, ...);
 int	del_rc_conf(const char *);
 void	add_sysctl_conf(const char *, ...) __printflike(1, 2);
 void	enable_rc_conf(void);
 void	set_sizemultname_cyl(void);
 void	set_sizemultname_meg(void);
 int	binary_available(const char *);
 int	check_lfs_progs(void);
 void	init_set_status(int);
 void	customise_sets(void);
 void	umount_mnt2(void);
 int 	set_is_source(const char *);
 const char *set_dir_for_set(const char *);
 const char *ext_dir_for_set(const char *);
 void	replace(const char *, const char *, ...);
 void	get_tz_default(void);
 int	extract_file(distinfo *, int);
 void	do_coloring (unsigned int, unsigned int);
 int set_menu_select(menudesc *, void *);
 const char *safectime(time_t *);
 /* from target.c */
 #if defined(DEBUG)  ||	defined(DEBUG_ROOT)
 void	backtowin(void);
 #endif
 const	char *concat_paths(const char *, const char *);
 const	char *target_expand(const char *);
 void	make_target_dir(const char *);
 void	append_to_target_file(const char *, const char *);
 void	echo_to_target_file(const char *, const char *);
 void	sprintf_to_target_file(const char *, const char *, ...)
     __printflike(2, 3);
 void	trunc_target_file(const char *);
 const	char *target_prefix(void);
 int	target_chdir(const char *);
 void	target_chdir_or_die(const char *);
 int	target_already_root(void);
 FILE	*target_fopen(const char *, const char *);
 int	target_collect_file(int, char **, const char *);
 int	is_active_rootpart(const char *, int);
 int	cp_to_target(const char *, const char *);
 void	dup_file_into_target(const char *);
 void	mv_within_target_or_die(const char *, const char *);
 int	cp_within_target(const char *, const char *, int);
 int	target_mount(const char *, const char *, int, const char *);
 int target_mount_do(const char *, const char *, const char *);
 int	target_test(unsigned int, const char *);
 int	target_dir_exists_p(const char *);
 int	target_file_exists_p(const char *);
 int	target_symlink_exists_p(const char *);
 void	unwind_mounts(void);
 int	target_mounted(void);
 /* from partman.c */
 int partman(void);
 int pm_partusage(pm_devs_t *, int, int);
 int pm_getrefdev(pm_devs_t *);
 void pm_setfstype(pm_devs_t *, int, int);
 int pm_editpart(int);
 void pm_rename(pm_devs_t *);
 int pm_shred(pm_devs_t *, int, int);
 void pm_umount(pm_devs_t *, int);
 int pm_unconfigure(pm_devs_t *);
 int pm_cgd_edit(void *, part_entry_t *);
 int pm_gpt_convert(pm_devs_t *);
 void pm_wedges_fill(pm_devs_t *);
 void pm_make_bsd_partitions(pm_devs_t *);
 void update_wedges(const char *);
 /* flags whether to offer the respective options (depending on helper
    programs available on install media */
 int have_raid, have_vnd, have_cgd, have_lvm, have_gpt, have_dk;
 /* initialize above variables */
 void check_available_binaries(void);
 /* from bsddisklabel.c */
 int	make_bsd_partitions(void);
 int	save_ptn(int, daddr_t, daddr_t, int, const char *);
 void	set_ptn_titles(menudesc *, int, void *);
 void	set_ptn_menu(struct ptn_info *);
 int	set_ptn_size(menudesc *, void *);
 void	get_ptn_sizes(daddr_t, daddr_t, int);
 int check_partitions(void);
 /* from aout2elf.c */
 int move_aout_libs(void);
 #ifdef WSKBD
 void	get_kb_encoding(void);
 void	save_kb_encoding(void);
 #else
 #define	get_kb_encoding()
 #define	save_kb_encoding()
 #endif
 /* from configmenu.c */
 void	do_configmenu(void);
 /* from checkrc.c */
 int	check_rcvar(const char *);
 int	check_rcdefault(const char *);
 	WINDOW *mainwin;
 #endif	/* _DEFS_H_ */

 @@ -1,1191 +1,1199 @@
-/*	$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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of Piermont Information Systems Inc. may not be used to endorse
  *    or promote products derived from this software without specific prior
  *    written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``AS IS''
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PIERMONT INFORMATION SYSTEMS INC. BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 /* MI Message catalog -- english, machine independent */
 message usage
 {usage: sysinst [-D] [-f definition_file] [-r release] [-C bg:fg]
+}
 message sysinst_message_language
 {Installation messages in English}
 message sysinst_message_locale
 {en_US.ISO8859-1}
 message Yes {Yes}
 message No {No}
 message All {All}
 message Some {Some}
 message None {None}
 message none {none}
 message OK {OK}
 message ok {ok}
 message On {On}
 message Off {Off}
 message unchanged {unchanged}
 message Delete {Delete?}
 message install
 {install}
 message reinstall
 {reinstall sets for}
 message upgrade
 {upgrade}
 message hello
 {NetBSD/@@MACHINE@@ @@VERSION@@
 This menu-driven tool is designed to help you install NetBSD to a hard
 disk, or upgrade an existing NetBSD system, with a minimum of work.
 In the following menus type the reference letter (a, b, c, ...) to
 select an item, or type CTRL+N/CTRL+P to select the next/previous item.
 The arrow keys and Page-up/Page-down may also work.
 Activate the current selection from the menu by typing the enter key.
+}
 message thanks
 {Thank you for using NetBSD!
+}
 message installusure
 {You have chosen to install NetBSD on your hard disk.  This will change
 information on your hard disk.  You should have made a full backup
 before this procedure!  This procedure will do the following things:
 	a) Partition your disk
 	b) Create new BSD file systems
 	c) Load and install distribution sets
 	d) Some initial system configuration
 (After you enter the partition information but before your disk is
 changed, you will have the opportunity to quit this procedure.)
 Shall we continue?
+}
 message upgradeusure
 {Ok, let's upgrade NetBSD on your hard disk.  As always, this will
 change information on your hard disk.  You should have made a full backup
 before this procedure!  Do you really want to upgrade NetBSD?
 (This is your last warning before this procedure starts modifying your
 disks.)
+}
 message reinstallusure
 {Ok, let's unpack the NetBSD distribution sets to a bootable hard disk.
 This procedure just fetches and unpacks sets onto a pre-partitioned
 bootable disk.  It does not label disks, upgrade bootblocks, or save
 any existing configuration info.  (Quit and choose `install' or
 `upgrade' if you want those options.)  You should have already done an
 `install' or `upgrade' before starting this procedure!
 Do you really want to reinstall NetBSD distribution sets?
 (This is your last warning before this procedure starts modifying your
 disks.)
+}
 message mount_failed
 {Mounting %s failed.  Continue?
+}
 message nodisk
 {I can not find any hard disks for use by NetBSD.  You will be
 returned to the original menu.
+}
 message onedisk
 {I found only one disk, %s.
 Therefore I assume you want to %s NetBSD on it.
+}
 message ask_disk
 {On which disk do you want to %s NetBSD? }
 message Available_disks
 {Available disks}
 message heads
 {heads}
 message sectors
 {sectors}
 message fs_isize
 {average file size (bytes)}
 message mountpoint
 {mount point (or 'none')}
 message cylname
 {cyl}
 message secname
 {sec}
 message megname
 {MB}
 message layout
 {NetBSD uses a BSD disklabel to carve up the NetBSD portion of the disk
 into multiple BSD partitions.  You must now set up your BSD disklabel.
 You can use a simple editor to set the sizes of the NetBSD partitions,
 or keep the existing partition sizes and contents.
 You will then be given the opportunity to change any of the disklabel
 fields.
 The NetBSD part of your disk is %d Megabytes.
 A full installation requires at least %d Megabytes without X and
 at least %d Megabytes if the X sets are included.
+}
 message Choose_your_size_specifier
 {Choosing megabytes will give partition sizes close to your choice,
 but aligned to cylinder boundaries.  Choosing sectors will allow you
 to more accurately specify the sizes.  On most disks, there is little
 to gain from cylinder alignment.  On very old disks, it is most efficient
 to choose partition sizes that are exact multiples of your actual
 cylinder size.
 Choose your size specifier}
 message ptnsizes
 {You can now change the sizes for the system partitions.  The default is
 to allocate all the space to the root file system.  However, you may wish
 to have separate /usr (additional system files), /var (log files etc)
 or /home (users' home directories) file systems.
 Free space will be added to the partition marked with a '+'.
+}
 message ptnheaders
+{
        MB         Cylinders   Sectors   Filesystem
+}
 message askfsmount
 {Mount point?}
 message askfssize
 {Size for %s in %s?}
 message askunits
 {Change input units (sectors/cylinders/MB)}
 message NetBSD_partition_cant_change
 {NetBSD partition}
 message Whole_disk_cant_change
 {Whole disk}
 message Boot_partition_cant_change
 {Boot partition}
 message add_another_ptn
 {Add a user defined partition}
 message fssizesok
 {Accept partition sizes.  Free space %d %s, %d free partitions.}
 message fssizesbad
 {Reduce partition sizes by %d %s (%u sectors).}
 message startoutsidedisk
 {The start value you specified is beyond the end of the disk.
+}
 message endoutsidedisk
 {With this value, the partition end is beyond the end of the disk.
 Your partition size has been truncated to %d %s.
 Type enter to continue
+}
 message toobigdisklabel
+{
 This disk is too large for a disklabel partition table to be used
 and hence cannot be used as a bootable disk or to hold the root
 partition.
+}
 message fspart
 {We now have your BSD disklabel partitions as:
 This is your last chance to change them.
+}
 message fspart_header
 {   Start %3s   End %3s  Size %3s FS type    Newfs Mount Mount point
    --------- --------- --------- ---------- ----- ----- -----------
+}
 message fspart_row
 {%9lu %9lu %9lu %-10s %-5s %-5s %s}
 message show_all_unused_partitions
 {Show all unused partitions}
 message partition_sizes_ok
 {Partition sizes ok}
 message edfspart
 {The current values for partition `%c' are,
 Select the field you wish to change:
                           MB cylinders   sectors
 	             ------- --------- ---------
+}
 message fstype_fmt
 {        FStype: %9s}
 message start_fmt
 {         start: %9u %8u%c %9u}
 message size_fmt
 {          size: %9u %8u%c %9u}
 message end_fmt
 {           end: %9u %8u%c %9u}
 message bsize_fmt
 {    block size: %9d bytes}
 message fsize_fmt
 { fragment size: %9d bytes}
 message isize_fmt
 { avg file size: %9d bytes (for number of inodes)}
 message isize_fmt_dflt
 { avg file size:         4 fragments}
 message newfs_fmt
 {         newfs: %9s}
 message mount_fmt
 {         mount: %9s}
 message mount_options_fmt
 { mount options: }
 message mountpt_fmt
 {   mount point: %9s}
 message toggle
 {Toggle}
 message restore
 {Restore original values}
 message Select_the_type
 {Select the type}
 message other_types
 {other types}
 message label_size
 {%s
 Special values that can be entered for the size value:
     -1:   use until the end of the NetBSD part of the disk
    a-%c:   end this partition where partition X starts
 size (%s)}
 message label_offset
 {%s
 Special values that can be entered for the offset value:
     -1:   start at the beginning of the NetBSD part of the disk
    a-%c:   start at the end of previous partition (a, b, ..., %c)
 start (%s)}
 message invalid_sector_number
 {Badly formed sector number
+}
 message Select_file_system_block_size
 {Select file system block size}
 message Select_file_system_fragment_size
 {Select file system fragment size}
 message packname
 {Please enter a name for your NetBSD disk}
 message lastchance
 {Ok, we are now ready to install NetBSD on your hard disk (%s).  Nothing has been
 written yet.  This is your last chance to quit this process before anything
 gets changed.
 Shall we continue?
+}
 message disksetupdone
 {Ok, the first part of the procedure is finished.  Sysinst has
 written a disklabel to the target disk, and newfs'ed and fsck'ed
 the new partitions you specified for the target disk.
+}
 message disksetupdoneupdate
 {Ok, the first part of the procedure is finished.  Sysinst has
 written a disklabel to the target disk, and fsck'ed the new
 partitions you specified for the target disk.
+}
 message openfail
 {Could not open %s, error message was: %s.
+}
 message mountfail
 {mount of device /dev/%s%c on %s failed.
+}
 message extractcomplete
 {The extraction of the selected sets for NetBSD-@@VERSION@@ is complete.
 The system is now able to boot from the selected hard disk.  To complete
 the installation, sysinst will give you the opportunity to configure
 some essential things first.
+}
 message instcomplete
 {The installation of NetBSD-@@VERSION@@ is now complete.  The system
 should boot from hard disk.  Follow the instructions in the INSTALL
 document about final configuration of your system.  We also recommend
 reading the afterboot(8) manpage; it contains a list of things to be
 checked after the first complete boot.
 At a minimum, you should edit /etc/rc.conf to match your needs.  See
 /etc/defaults/rc.conf for the default values.
+}
 message upgrcomplete
 {The upgrade to NetBSD-@@VERSION@@ is now complete.  You will
 now need to follow the instructions in the INSTALL document as to
 what you need to do to get your system reconfigured for your situation.
 Remember to (re)read the afterboot(8) manpage as it may contain new
 items since your last upgrade.
+}
 message unpackcomplete
 {Unpacking additional release sets of NetBSD-@@VERSION@@ is now complete.
 You will now need to follow the instructions in the INSTALL document
 to get your system reconfigured for your situation.
 The afterboot(8) manpage can also be of some help.
 If you unpacked the etc set, you will need to edit /etc/rc.conf to get a
 multi-user system.  At a minimum, you will need to change rc_configured=NO
 to rc_configured=YES.
+}
 message distmedium
 {Your disk is now ready for installing the kernel and the distribution
 sets.  As noted in your INSTALL notes, you have several options.  For
 ftp or nfs, you must be connected to a network with access to the proper
 machines.
 Sets selected %d, processed %d, Next set %s.
+}
 message distset
 {The NetBSD distribution is broken into a collection of distribution
 sets.  There are some basic sets that are needed by all installations
 and there are some other sets that are optional.  You may choose to install
 a core set (Minimal installation), all of them (Full installation), or a custom
 group of sets (Custom installation).
+}
 message ftpsource
 {The following are the %s site, directory, user, and password that
 will be used.  If "user" is "ftp", then the password is not needed.
+}
 message email
 {e-mail address}
 message dev
 {device}
 message nfssource
 {Enter the nfs host and server directory where the distribution is located.
 Remember, the directory should contain the .tgz files and
 must be nfs mountable.
+}
 message floppysource
 {Enter the floppy device to be used and transfer directory on the target
 file system.  The set files must be in the root directory of the floppies.
+}
 message cdromsource
 {Enter the CDROM device to be used and directory on the CDROM where
 the distribution is located.
 Remember, the directory should contain the .tgz files.
+}
 message Available_cds
 {Available CDs }
 message ask_cd
 {Multiple CDs found.  Please select the one containing the install CD.}
 message cd_path_not_found
 {The installation sets have not been found at the default location on this
 CD.  Please check the device and path name.}
 message localfssource
 {Enter the unmounted local device and directory on that device where
 the distribution is located.
 Remember, the directory should contain the .tgz files.
+}
 message localdir
 {Enter the already-mounted local directory where the distribution is located.
 Remember, the directory should contain the .tgz files.
+}
 message filesys
 {file system}
 message nonet
 {I can not find any network interfaces for use by NetBSD.  You will be
 returned to the previous menu.
+}
 message netup
 {The following network interfaces are active: %s
 Does one of them connect to the required server?}
 message asknetdev
 {Which network device would you like to use?}
 message netdevs
 {Available interfaces}
 message netinfo
 {To be able to use the network, we need answers to the following:
+}
 message net_domain
 {Your DNS domain}
 message net_host
 {Your host name}
 message net_ip
 {Your IPv4 address}
 message net_srv_ip
 {Server IPv4 address}
 message net_mask
 {IPv4 Netmask}
 message net_namesrv
 {Your name server}
 message net_defroute
 {IPv4 gateway}
 message net_media
 {Network media type}
 message netok
 {The following are the values you entered.
 DNS Domain:		%s
 Host Name:		%s
 Nameserver:		%s
 Primary Interface:	%s
 Media type:		%s
 Host IP:		%s
 Netmask:		%s
 IPv4 Gateway:		%s
+}
 message netok_slip
 {The following are the values you entered.  Are they OK?
 DNS Domain:		%s
 Host Name:		%s
 Nameserver:		%s
 Primary Interface:	%s
 Media type:		%s
 Host IP:		%s
 Server IP:		%s
 Netmask:		%s
 IPv4 Gateway:		%s
+}
 message netokv6
 {IPv6 autoconf:		%s
+}
 message netok_ok
 {Are they OK?}
 message wait_network
+{
 Waiting while network interface comes up.
+}
 message resolv
 {Could not create /etc/resolv.conf.  Install aborted.
+}
 message realdir
 {Could not change to directory %s: %s.  Install aborted.
+}
 message delete_xfer_file
 {Delete after install}
 message notarfile
 {Release set %s does not exist.}
 message endtarok
 {All selected distribution sets unpacked successfully.}
 message endtar
 {There were problems unpacking distribution sets.
 Your installation is incomplete.
 You selected %d distribution sets.  %d sets couldn't be found
 and %d were skipped after an error occurred.  Of the %d
 that were attempted, %d unpacked without errors and %d with errors.
 Aborting installation.  Please recheck your distribution source
 and consider reinstalling sets from the main menu.}
 message abort
 {Your choices have made it impossible to install NetBSD.  Install aborted.
+}
 message abortinst
 {The distribution was not successfully loaded.  You will need to proceed
 by hand.  Installation aborted.
+}
 message abortupgr
 {The distribution was not successfully loaded.  You will need to proceed
 by hand.  Upgrade aborted.
+}
 message abortunpack
 {Unpacking additional sets was not successful.  You will need to
 proceed by hand, or choose a different source for release sets and try
 again.
+}
 message createfstab
 {There is a big problem!  Can not create /mnt/etc/fstab.  Bailing out!
+}
 message noetcfstab
 {Help! No /etc/fstab in target disk %s.  Aborting upgrade.
+}
 message badetcfstab
 {Help! Can't parse /etc/fstab in target disk %s.  Aborting upgrade.
+}
 message X_oldexists
 {I cannot save %s/bin/X as %s/bin/X.old, because the
 target disk already has an %s/bin/X.old.  Please fix this before
 continuing.
 One way is to start a shell from the Utilities menu, examine the
 target %s/bin/X and %s/bin/X.old.  If
 %s/bin/X.old is from a completed upgrade, you can rm -f
 %s/bin/X.old and restart.  Or if %s/bin/X.old is from
 a recent, incomplete upgrade, you can rm -f %s/bin/X and mv
 %s/bin/X.old to %s/bin/X
 Aborting upgrade.}
 message netnotup
 {There was a problem in setting up the network.  Either your gateway
 or your nameserver was not reachable by a ping.  Do you want to
 configure your network again?  ("No" allows you to continue anyway
 or abort the install process.)
+}
 message netnotup_continueanyway
 {Would you like to continue the install process anyway, and assume
 that the network is working?  ("No" aborts the install process.)
+}
 message makedev
 {Making device nodes ...
+}
 message badfs
 {It appears that /dev/%s%c is not a BSD file system or the fsck was
 not successful.  Try mounting it anyway?  (Error number %d.)
+}
 message rootmissing
 { target root is missing %s.
+}
 message badroot
 {The completed new root file system failed a basic sanity check.
 Are you sure you installed all the required sets?
+}
 message fd_type
 {Floppy file system type}
 message fdnotfound
 {Could not find the file on the floppy.
+}
 message fdremount
 {The floppy was not mounted successfully.
+}
 message fdmount
 {Please load the floppy containing the file named "%s.%s".
 If the set has no more disks, select "Set finished" to install the set.
 Select "Abort fetch" to return to the install media selection menu.
+}
 message mntnetconfig
 {Is the network information you entered accurate for this machine
 in regular operation and do you want it installed in /etc? }
 message cur_distsets
 {The following is the list of distribution sets that will be used.
+}
 message cur_distsets_header
 {   Distribution set         Selected
    ------------------------ --------
+}
 message set_base
 {Base}
 message set_system
 {Configuration files (/etc)}
 message set_compiler
 {Compiler tools}
 message set_games
 {Games}
 message set_man_pages
 {Manual pages}
 message set_misc
 {Miscellaneous}
 message set_modules
 {Kernel modules}
 message set_tests
 {Test programs}
 message set_text_tools
 {Text processing tools}
 message set_X11
 {X11 sets}
 message set_X11_base
 {X11 base and clients}
 message set_X11_etc
 {X11 configuration}
 message set_X11_fonts
 {X11 fonts}
 message set_X11_servers
 {X11 servers}
 message set_X11_prog
 {X11 programming}
 message set_source
 {Source and debug sets}
 message set_syssrc
 {Kernel sources}
 message set_src
 {Base sources}
 message set_sharesrc
 {Share sources}
 message set_gnusrc
 {GNU sources}
 message set_xsrc
 {X11 sources}
 message set_debug
 {Debug symbols}
 message set_xdebug
 {X11 debug symbols}
 message cur_distsets_row
 {%-27s %3s}
 message select_all
 {Select all the above sets}
 message select_none
 {Deselect all the above sets}
 message install_selected_sets
 {Install selected sets}
 message tarerror
 {There was an error in extracting the file %s.  That means
 some files were not extracted correctly and your system will not be
 complete.
 Continue extracting sets?}
 message must_be_one_root
 {There must be a single partition marked to be mounted on '/'.}
 message partitions_overlap
 {partitions %c and %c overlap.}
 message No_Bootcode
 {No bootcode for specified FS type of root partition}
 message cannot_ufs2_root
 {Sorry, the root file system can't be FFSv2 due to lack of bootloader support
 on this port.}
 message edit_partitions_again
+{
 You can either edit the partition table by hand, or give up and return
 to the main menu.
 Edit the partition table again?}
 message config_open_error
 {Could not open config file %s\n}
 message choose_timezone
 {Please choose the timezone that fits you best from the list below.
 Press RETURN to select an entry.
 Press 'x' followed by RETURN to quit the timezone selection.
  Default:	%s
  Selected:	%s
  Local time: 	%s %s
+}
 message tz_back
 { Back to main timezone list}
 message swapactive
 {The disk that you selected has a swap partition that may currently be
 in use if your system is low on memory.  Because you are going to
 repartition this disk, this swap partition will be disabled now.  Please
 beware that this might lead to out of swap errors.  Should you get such
 an error, please restart the system and try again.}
 message swapdelfailed
 {Sysinst failed to deactivate the swap partition on the disk that you
 chose for installation.  Please reboot and try again.}
 message rootpw
 {The root password of the newly installed system has not yet been initialized,
 and is thus empty.  Do you want to set a root password for the system now?}
 message rootsh
 {You can now select which shell to use for the root user.  The default is
 /bin/sh, but you may prefer another one.}
 message no_root_fs
+{
 There is no defined root file system.  You need to define at least
 one mount point with "/".
 Press <return> to continue.
+}
 message slattach {
 Enter slattach flags
+}
 message Pick_an_option {Pick an option to turn on or off.}
 message Scripting {Scripting}
 message Logging {Logging}
 message Status  { Status: }
 message Command {Command: }
 message Running {Running}
 message Finished {Finished}
 message Command_failed {Command failed}
 message Command_ended_on_signal {Command ended on signal}
 message NetBSD_VERSION_Install_System {NetBSD-@@VERSION@@ Install System}
 message Exit_Install_System {Exit Install System}
 message Install_NetBSD_to_hard_disk {Install NetBSD to hard disk}
 message Upgrade_NetBSD_on_a_hard_disk {Upgrade NetBSD on a hard disk}
 message Re_install_sets_or_install_additional_sets {Re-install sets or install additional sets}
 message Reboot_the_computer {Reboot the computer}
 message Utility_menu {Utility menu}
 message Config_menu {Config menu}
 message exit_utility_menu {Back to main menu}
 message exit_menu_generic {Exit}
 message NetBSD_VERSION_Utilities {NetBSD-@@VERSION@@ Utilities}
 message Run_bin_sh {Run /bin/sh}
 message Set_timezone {Set timezone}
 message Configure_network {Configure network}
 message Partition_a_disk {Partition a disk}
 message Logging_functions {Logging functions}
 message Halt_the_system {Halt the system}
 message yes_or_no {yes or no?}
 message Hit_enter_to_continue {Hit enter to continue}
 message Choose_your_installation {Choose your installation}
 message Set_Sizes {Set sizes of NetBSD partitions}
 message Use_Existing {Use existing partition sizes}
 message Megabytes {Megabytes}
 message Cylinders {Cylinders}
 message Sectors {Sectors}
 message Select_medium {Install from}
 message ftp {FTP}
 message http {HTTP}
 message nfs {NFS}
 .if HAVE_INSTALL_IMAGE
 message cdrom {CD-ROM / DVD / install image media}
 .else
 message cdrom {CD-ROM / DVD}
 .endif
 message floppy {Floppy}
 message local_fs {Unmounted fs}
 message local_dir {Local directory}
 message Select_your_distribution {Select your distribution}
 message Full_installation {Full installation}
 message Full_installation_nox {Installation without X11}
 message Minimal_installation {Minimal installation}
 message Custom_installation {Custom installation}
 message hidden {** hidden **}
 message Host {Host}
 message Base_dir {Base directory}
 message Set_dir_bin {Binary set directory}
 message Set_dir_src {Source set directory}
 message Xfer_dir {Transfer directory}
 message User {User}
 message Password {Password}
 message Proxy {Proxy}
 message Get_Distribution {Get Distribution}
 message Continue {Continue}
 message What_do_you_want_to_do {What do you want to do?}
 message Try_again {Try again}
 message Set_finished {Set finished}
 message Skip_set {Skip set}
 message Skip_group {Skip set group}
 message Abandon {Abandon installation}
 message Abort_fetch {Abort fetch}
 message Device {Device}
 message File_system {File system}
 message Select_DNS_server {  Select DNS server}
 message other {other }
 message Perform_autoconfiguration {Perform autoconfiguration?}
 message Root_shell {Root shell}
 message User_shell {User shell}
 message Color_scheme {Color scheme}
 message White_on_black {White on black}
 message Black_on_white {Black on white}
 message White_on_blue {White on blue}
 message Green_on_black {Green on black}
 .if AOUT2ELF
 message aoutfail
 {The directory where the old a.out shared libraries should be moved to could
 not be created.  Please try the upgrade procedure again and make sure you
 have mounted all file systems.}
 message emulbackup
 {Either the /emul/aout or /emul directory on your system was a symbolic link
 pointing to an unmounted file system.  It has been given a '.old' extension.
 Once you bring your upgraded system back up, you may need to take care
 of merging the newly created /emul/aout directory with the old one.
+}
 .endif
 message oldsendmail
 {Sendmail is no longer in this release of NetBSD, default MTA is
 postfix.  The file /etc/mailer.conf still chooses the removed
 sendmail.  Do you want to upgrade /etc/mailer.conf automatically for
 postfix? If you choose "No" you will have to update /etc/mailer.conf
 yourself to ensure proper email delivery.}
 message license
 {To use the network interface %s, you must agree to the license in
 file %s.  To view this file now, you can type ^Z, look at the contents of
 the file and then type "fg" to resume.}
 message binpkg
 {To configure the binary package system, please choose the network location
 to fetch packages from.  Once your system comes up, you can use 'pkgin'
 to install additional packages, or remove packages.}
 message pkgpath
 {Enabling binary packages with pkgin requires setting up the repository.
 The following are the host, directory, user, and password that
 will be used.  If "user" is "ftp", then the password is not needed.
+}
 message rcconf_backup_failed {Making backup of rc.conf failed.  Continue?}
 message rcconf_backup_succeeded {rc.conf backup saved to %s.}
 message rcconf_restore_failed {Restoring backup rc.conf failed.}
 message rcconf_delete_failed {Deleting old %s entry failed.}
 message Pkg_dir {Package directory}
 message configure_prior {configure a prior installation of}
 message configure {configure}
 message change {change}
 message password_set {password set}
 message YES {YES}
 message NO {NO}
 message DONE {DONE}
 message abandoned {Abandoned}
 message empty {***EMPTY***}
 message timezone {Timezone}
 message change_rootpw {Change root password}
 message enable_binpkg {Enable installation of binary packages}
 message enable_sshd {Enable sshd}
 message enable_ntpd {Enable ntpd}
 message run_ntpdate {Run ntpdate at boot}
 message enable_mdnsd {Enable mdnsd}
 message enable_xdm {Enable xdm}
 message enable_cgd {Enable cgd}
 message enable_lvm {Enable lvm}
 message enable_raid {Enable raidframe}
 message add_a_user {Add a user}
 message configmenu {Configure the additional items as needed.}
 message doneconfig {Finished configuring}
 message Install_pkgin {Install pkgin and update package summary}
 message binpkg_installed
 {Your system is now configured to use pkgin to install binary packages.  To
 install a package, run:
 pkgin install <packagename>
 from a root shell.  Read the pkgin(1) manual page for further information.}
 message Install_pkgsrc {Fetch and unpack pkgsrc}
 message pkgsrc
 {Installing pkgsrc requires unpacking an archive retrieved over the network.
 The following are the host, directory, user, and password that
 will be used.  If "user" is "ftp", then the password is not needed.
+}
 message Pkgsrc_dir {pkgsrc directory}
 message get_pkgsrc {Fetch and unpack pkgsrc for building from source}
 message retry_pkgsrc_network {Network configuration failed.  Retry?}
 message quit_pkgsrc {Quit without installing pkgsrc}
 message quit_pkgs_install {Quit installing binary pkgs}
 message pkgin_failed
 {Installation of pkgin failed, possibly because no binary packages
 exist.  Please check the package path and try again.}
 message failed {Failed}
 message notsupported {Operation not supported!}
 message askfsmountadv {Mountpoint (or 'raid', 'cgd', 'lvm')?}
 message partman {Extended partitioning}
 message editbsdpart {Edit BSD partitions}
 message editmbr {Edit and save MBR}
 message switchgpt {Switch to GPT}
 message switchmbr {Switch to MBR}
 message renamedisk {Set disk name}
 message fmtasraid {Format as RAID}
 message fmtaslvm {Format as LVM PV}
 message encrypt {Encrypt}
 message setbootable {Bootable flag}
 message erase {Safe erase}
 message undo {Undo changes}
 message unconfig {Unconfigure}
 message edit {Edit}
 message doumount {Force umount}
 message fillzeros {Fill with zeros}
 message fillrandom {Fill with random data}
 message fillcrypto {Fill with crypto data}
 message raid0 {0 - No parity, simple striping.}
 message raid1 {1 - Mirroring.  The parity is the mirror.}
 message raid4 {4 - Striping with parity stored on the last component.}
 message raid5 {5 - Striping with distributed parity.}
 message fremove {REMOVE}
 message remove {Remove}
 message add {Add}
 message auto {auto}
 message removepartswarn {This removes all partitions on the disk.  Do you want to continue?}
 message saveprompt {Save changes before finishing?}
 message cantsave {Changes cannot be saved.}
 message noroot {No root partition defined.  Cannot continue\n}
 message wannaunblock {
 Device is blocked.  Editing it may cause problems.
 Do you want to force unblock it and continue?}
 message wannatry {Do you want to try?}
 message create_cgd {Create cryptographic volume (CGD)}
 message create_cnd {Create virtual disk image (VND)}
 message create_vg {Create volume group (LVM VG)}
 message create_lv {      Create logical volume}
 message create_raid {Create software RAID}
 message updpmlist {Update device list}
 message savepm {Save changes}
 message pmblocked {BLOCKED}
 message pmunchanged {UNCHANGED}
 message pmsetboot {BOOT}
 message pmused {USED}
 message pmmounted {(mounted)}
 message pmunused {(unused)}
 message pmgptdisk {GPT-labeled disk}
 message finishpm {Finish partitioning}
 message limitcount {Limit for the device count was reached!}
 message invaliddev {Invalid device!}
 message avdisks {Available disks:}
 message nofreedev {Cannot allocate device node!}
 message partman_header
 {This is the extended partition manager.  All disks, partitions, etc. are
 listed below.  MBR partitions, if desired, must be created before editing
 the disklabel.  To use RAID, LVM, or CGD: 1) Create BSD partitions with the
 appropriate type; 2) Create RAID/LVM VG/CGD using these partitions; 3) Save
 changes; 4) Create partitions for RAID/CGD or Logical Volumes for LVM.}
 message raid_menufmt {   raid%d (level %1d) on %-34s %11uM}
 message raid_err_menufmt {   EMPTY RAID!}
 message raid_disks_fmt {Disks: %33s}
 message raid_spares_fmt {Spares: %32s}
 message raid_level_fmt {RAID level:       %22d}
 message raid_numrow_fmt {numRow:           %22d}
 message raid_numcol_fmt {numCol:           %22d}
 message raid_numspare_fmt {numSpare:         %22d}
 message raid_sectpersu_fmt {sectPerSU:        %22d}
 message raid_superpar_fmt {SUsPerParityUnit: %22d}
 message raid_superrec_fmt {SUsPerReconUnit:  %22d}
 message raid_nomultidim {Multi-dimensional arrays are NOT supported!}
 message raid_numrow_ask {numRow?}
 message raid_numcol_ask {numCol?}
 message raid_numspare_ask {numSpare?}
 message raid_sectpersu_ask {sectPerSU?}
 message raid_superpar_ask {SUsPerParityUnit?}
 message raid_superrec_ask {SUsPerReconUnit?}
 message raid_disks {Disks in RAID:}
 message vnd_err_menufmt {   PATH NOT DEFINED!}
 message vnd_assgn_menufmt {   vnd%1d on %-51s ASSIGN}
 message vnd_menufmt {   vnd%1d on %-45s %11uM}
 message vnd_path_fmt {File path: %29s}
 message vnd_assgn_fmt {Create new image: %20s}
 message vnd_size_fmt {Size:            %22sM}
 message vnd_ro_fmt {Read-only:        %22s}
 message vnd_geom_fmt {Set geometry by hand: %18s}
 message vnd_bps_fmt {Bytes per Sector:     %18s}
 message vnd_spt_fmt {Sectors per Track:    %18s}
 message vnd_tpc_fmt {Tracks per Cylinder:  %18s}
 message vnd_cyl_fmt {Cylinders:        %22s}
 message vnd_path_ask {File path?}
 message vnd_size_ask {Size (MB)?}
 message vnd_bps_ask {Bytes per Sector?}
 message vnd_spt_ask {Sectors per Track?}
 message vnd_tpc_ask {Tracks per Cylinder?}
 message vnd_cyl_ask {Cylinders?}
 message cgd_err_menufmt {   DISK NOT DEFINED!}
 message cgd_menufmt {   cgd%1d %-48s %11uM}
 message cgd_dev_fmt {Base device:    %24s}
 message cgd_enc_fmt {Encryption:      %24s}
 message cgd_key_fmt {Key size:       %24d}
 message cgd_iv_fmt {IV algorithm:   %24s}
 message cgd_keygen_fmt {Key generation: %24s}
 message cgd_verif_fmt {Verification method:   %17s}
 message lvm_disks {Disks in VG:}
 message lvm_menufmt {   %-44s %20sM}
 message lvm_err_menufmt {   EMPTY VG!}
 message lvm_disks_fmt {PV's: %34s}
 message lvm_name_fmt {Name: %34s}
 message lvm_maxlv_fmt {MaxLogicalVolumes:  %20s}
 message lvm_maxpv_fmt {MaxPhysicalVolumes: %20s}
 message lvm_extsiz_fmt {PhysicalExtentSize: %20s}
 message lvm_name_ask {Name?}
 message lvm_maxlv_ask {MaxLogicalVolumes?}
 message lvm_maxpv_ask {MaxPhysicalVolumes?}
 message lvm_extsiz_ask {PhysicalExtentSize (MB)?}
 message lvmlv_menufmt {      Logical volume %-35s %11uM}
 message lvmlv_name_fmt {Name: %34s}
 message lvmlv_size_fmt {Size: %33dM}
 message lvmlv_ro_fmt {Read-only:   %27s}
 message lvmlv_cont_fmt {Contiguous:  %27s}
 message lvmlv_extnum_fmt {LogicalExtentsNumber: %18s}
 message lvmlv_minor_fmt {Minor number: %26s}
 message lvmlv_mirrors_fmt {Mirrors:     %27d}
 message lvmlv_regsiz_fmt {MirrorLogRegionSize:  %18s}
 message lvmlv_pers_fmt {Persistent minor number:  %14s}
 message lvmlv_readahsect_fmt {ReadAheadSectors:     %18s}
 message lvmlv_stripes_fmt {Stripes:     %27s}
 message lvmlv_stripesiz_fmt {StripeSize:  %27s}
 message lvmlv_zero_fmt {Zeroing of the first KB:   %13s}
 message lvmlv_name_ask {Name?}
 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,1491 +1,1693 @@
-/*	$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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of Piermont Information Systems Inc. may not be used to endorse
  *    or promote products derived from this software without specific prior
  *    written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``AS IS''
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PIERMONT INFORMATION SYSTEMS INC. BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 /* disks.c -- routines to deal with finding disks and labeling disks. */
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <util.h>
 #include <uuid.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/swap.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
 #define FSTYPENAMES
 #include <sys/disklabel.h>
 #include <sys/disklabel_gpt.h>
 #include <dev/scsipi/scsipi_all.h>
 #include <sys/scsiio.h>
 #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;
 };
 static const struct gptfs_t gpt_filesystems[] = {
     { "swap", FS_SWAP, GPT_ENT_TYPE_NETBSD_SWAP, },
     { "ffs", FS_BSDFFS, GPT_ENT_TYPE_NETBSD_FFS, },
     { "lfs", FS_BSDLFS, GPT_ENT_TYPE_NETBSD_LFS, },
     { "linux", FS_EX2FS, GPT_ENT_TYPE_LINUX_DATA, },
     { "windows,", FS_MSDOS, GPT_ENT_TYPE_MS_BASIC_DATA, },
     { "hfs", FS_HFS, GPT_ENT_TYPE_APPLE_HFS, },
     { "ufs", FS_OTHER, GPT_ENT_TYPE_APPLE_UFS, },
     { "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
  * when the machine has more than 16 MB of user memory. On smaller machines,
  * shm_open() and friends will not perform well anyway.
  */
 static bool
 tmpfs_on_var_shm()
+{
 	uint64_t ram;
 	size_t len;
 	len = sizeof(ram);
 	if (sysctlbyname("hw.usermem64", &ram, &len, NULL, 0))
 		return false;
 	return ram > 16UL*1024UL*1024UL;
+}
 /* from src/sbin/atactl/atactl.c
  * extract_string: copy a block of bytes out of ataparams and make
  * a proper string out of it, truncating trailing spaces and preserving
  * strict typing. And also, not doing unaligned accesses.
  */
 static void
 ata_extract_string(char *buf, size_t bufmax,
 		   uint8_t *bytes, unsigned numbytes,
 		   int needswap)
+{
 	unsigned i;
 	size_t j;
 	unsigned char ch1, ch2;
 	for (i = 0, j = 0; i < numbytes; i += 2) {
 		ch1 = bytes[i];
 		ch2 = bytes[i+1];
 		if (needswap && j < bufmax-1) {
 			buf[j++] = ch2;
+		}
 		if (j < bufmax-1) {
 			buf[j++] = ch1;
+		}
 		if (!needswap && j < bufmax-1) {
 			buf[j++] = ch2;
+		}
+	}
 	while (j > 0 && buf[j-1] == ' ') {
 		j--;
+	}
 	buf[j] = '\0';
+}
 /*
  * from src/sbin/scsictl/scsi_subr.c
  */
 #define STRVIS_ISWHITE(x) ((x) == ' ' || (x) == '\0' || (x) == (u_char)'\377')
 static void
 scsi_strvis(char *sdst, size_t dlen, const char *ssrc, size_t slen)
+{
 	u_char *dst = (u_char *)sdst;
 	const u_char *src = (const u_char *)ssrc;
 	/* Trim leading and trailing blanks and NULs. */
 	while (slen > 0 && STRVIS_ISWHITE(src[0]))
 		++src, --slen;
 	while (slen > 0 && STRVIS_ISWHITE(src[slen - 1]))
 		--slen;
 	while (slen > 0) {
 		if (*src < 0x20 || *src >= 0x80) {
 			/* non-printable characters */
 			dlen -= 4;
 			if (dlen < 1)
 				break;
 			*dst++ = '\\';
 			*dst++ = ((*src & 0300) >> 6) + '0';
 			*dst++ = ((*src & 0070) >> 3) + '0';
 			*dst++ = ((*src & 0007) >> 0) + '0';
 		} else if (*src == '\\') {
 			/* quote characters */
 			dlen -= 2;
 			if (dlen < 1)
 				break;
 			*dst++ = '\\';
 			*dst++ = '\\';
 		} else {
 			/* normal characters */
 			if (--dlen < 1)
 				break;
 			*dst++ = *src;
+		}
 		++src, --slen;
+	}
 	*dst++ = 0;
+}
 static int
 get_descr_scsi(struct disk_desc *dd, int fd)
+{
 	struct scsipi_inquiry_data inqbuf;
 	struct scsipi_inquiry cmd;
 	scsireq_t req;
         /* x4 in case every character is escaped, +1 for NUL. */
 	char vendor[(sizeof(inqbuf.vendor) * 4) + 1],
 	     product[(sizeof(inqbuf.product) * 4) + 1],
 	     revision[(sizeof(inqbuf.revision) * 4) + 1];
 	char size[5];
 	int error;
 	memset(&inqbuf, 0, sizeof(inqbuf));
 	memset(&cmd, 0, sizeof(cmd));
 	memset(&req, 0, sizeof(req));
 	cmd.opcode = INQUIRY;
 	cmd.length = sizeof(inqbuf);
 	memcpy(req.cmd, &cmd, sizeof(cmd));
 	req.cmdlen = sizeof(cmd);
 	req.databuf = &inqbuf;
 	req.datalen = sizeof(inqbuf);
 	req.timeout = 10000;
 	req.flags = SCCMD_READ;
 	req.senselen = SENSEBUFLEN;
 	error = ioctl(fd, SCIOCCOMMAND, &req);
 	if (error == -1 || req.retsts != SCCMD_OK)
 		return 0;
 	scsi_strvis(vendor, sizeof(vendor), inqbuf.vendor,
 	    sizeof(inqbuf.vendor));
 	scsi_strvis(product, sizeof(product), inqbuf.product,
 	    sizeof(inqbuf.product));
 	scsi_strvis(revision, sizeof(revision), inqbuf.revision,
 	    sizeof(inqbuf.revision));
 	humanize_number(size, sizeof(size),
 	    (uint64_t)dd->dd_secsize * (uint64_t)dd->dd_totsec,
 	    "", HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL);
 	snprintf(dd->dd_descr, sizeof(dd->dd_descr),
 	    "%s (%s, %s %s)",
 	    dd->dd_name, size, vendor, product);
 	return 1;
+}
 static int
 get_descr_ata(struct disk_desc *dd, int fd)
+{
 	struct atareq req;
 	static union {
 		unsigned char inbuf[DEV_BSIZE];
 		struct ataparams inqbuf;
 	} inbuf;
 	struct ataparams *inqbuf = &inbuf.inqbuf;
 	char model[sizeof(inqbuf->atap_model)+1];
 	char size[5];
 	int error, needswap = 0;
 	memset(&inbuf, 0, sizeof(inbuf));
 	memset(&req, 0, sizeof(req));
 	req.flags = ATACMD_READ;
 	req.command = WDCC_IDENTIFY;
 	req.databuf = (void *)&inbuf;
 	req.datalen = sizeof(inbuf);
 	req.timeout = 1000;
 	error = ioctl(fd, ATAIOCCOMMAND, &req);
 	if (error == -1 || req.retsts != ATACMD_OK)
 		return 0;
 #if BYTE_ORDER == LITTLE_ENDIAN
 	/*
 	 * On little endian machines, we need to shuffle the string
 	 * byte order.  However, we don't have to do this for NEC or
 	 * Mitsumi ATAPI devices
 	 */
 	if (!(inqbuf->atap_config != WDC_CFG_CFA_MAGIC &&
 	      (inqbuf->atap_config & WDC_CFG_ATAPI) &&
 	      ((inqbuf->atap_model[0] == 'N' &&
 	        inqbuf->atap_model[1] == 'E') ||
 	       (inqbuf->atap_model[0] == 'F' &&
 	        inqbuf->atap_model[1] == 'X')))) {
 		needswap = 1;
+	}
 #endif
 	ata_extract_string(model, sizeof(model),
 	    inqbuf->atap_model, sizeof(inqbuf->atap_model), needswap);
 	humanize_number(size, sizeof(size),
 	    (uint64_t)dd->dd_secsize * (uint64_t)dd->dd_totsec,
 	    "", HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL);
 	snprintf(dd->dd_descr, sizeof(dd->dd_descr), "%s (%s, %s)",
 	    dd->dd_name, size, model);
 	return 1;
+}
 static void
 get_descr(struct disk_desc *dd)
+{
 	char diskpath[MAXPATHLEN];
 	int fd = -1;
 	fd = opendisk(dd->dd_name, O_RDONLY, diskpath, sizeof(diskpath), 0);
 	if (fd < 0)
 		goto done;
 	dd->dd_descr[0] = '\0';
 	/* try ATA */
 	if (get_descr_ata(dd, fd))
 		goto done;
 	/* try SCSI */
 	if (get_descr_scsi(dd, fd))
 		goto done;
 	/* XXX: get description from raid, cgd, vnd... */
 done:
 	if (fd >= 0)
 		close(fd);
 	if (strlen(dd->dd_descr) == 0)
 		strcpy(dd->dd_descr, dd->dd_name);
+}
 /* disknames - contains device names without partition letters
  * cdrom_devices - contains devices including partition letters
  * returns the first entry in hw.disknames matching a cdrom_device, or
  * first entry on error or no match
  */
 const char *
 get_default_cdrom(void)
+{
 	static const char *cdrom_devices[] = { CD_NAMES, 0};
 	static const char mib_name[] = "hw.disknames";
 	size_t len;
 	char *disknames;
 	char *last;
 	char *name;
 	const char **arg;
 	const char *cd_dev;
 	/* On error just use first entry in cdrom_devices */
 	if (sysctlbyname(mib_name, NULL, &len, NULL, 0) == -1)
 		return cdrom_devices[0];
 	if ((disknames = malloc(len + 2)) == 0) /* skip on malloc fail */
 		return cdrom_devices[0];
 	(void)sysctlbyname(mib_name, disknames, &len, NULL, 0);
 	for ((name = strtok_r(disknames, " ", &last)); name;
 	    (name = strtok_r(NULL, " ", &last))) {
 		for (arg = cdrom_devices; *arg; ++arg) {
 			cd_dev = *arg;
 			/* skip unit and partition */
 			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)
 			return -1;
+	}
 	/* Fill pm struct with device(s) info */
 	for (i = 0; i < numdisks; i++) {
 		if (! partman_go)
 			disk = disks + selected_disk;
 		else {
 			disk = disks + i;
 			already_found = 0;
 			SLIST_FOREACH(pm_i, &pm_head, l) {
 				pm_last = pm_i;
 				if (!already_found &&
 				    strcmp(pm_i->diskdev, disk->dd_name) == 0) {
 					pm_i->found = 1;
 					break;
+				}
+			}
 			if (pm_i != NULL && pm_i->found)
 				/* We already added this device, skipping */
 				continue;
+		}
 		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());
 #endif
+}
 void
 fmt_fspart(menudesc *m, int ptn, void *arg)
+{
 	unsigned int poffset, psize, pend;
 	const char *desc;
 	static const char *Yes;
 	partinfo *p = pm->bsdlabel + ptn;
 	if (Yes == NULL)
 		Yes = msg_string(MSG_Yes);
 	poffset = p->pi_offset / sizemult;
 	psize = p->pi_size / sizemult;
 	if (psize == 0)
 		pend = 0;
 	else
 		pend = (p->pi_offset + p->pi_size) / sizemult - 1;
 	if (p->pi_fstype == FS_BSDFFS)
 		if (p->pi_flags & PIF_FFSv2)
 			desc = "FFSv2";
 		else
 			desc = "FFSv1";
 	else
 		desc = getfslabelname(p->pi_fstype);
 #ifdef PART_BOOT
 	if (ptn == PART_BOOT)
 		desc = msg_string(MSG_Boot_partition_cant_change);
 #endif
 	if (ptn == getrawpartition())
 		desc = msg_string(MSG_Whole_disk_cant_change);
 	else {
 		if (ptn == PART_C)
 			desc = msg_string(MSG_NetBSD_partition_cant_change);
+	}
 	wprintw(m->mw, msg_string(MSG_fspart_row),
 			poffset, pend, psize, desc,
 			p->pi_flags & PIF_NEWFS ? Yes : "",
 			p->pi_flags & PIF_MOUNT ? Yes : "",
 			p->pi_mount);
+}
 /*
  * Label a disk using an MD-specific string DISKLABEL_CMD for
  * to invoke disklabel.
  * 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)
+{
 	return strcmp(pm->bsdlabel[*(const int *)a].pi_mount,
 		      pm->bsdlabel[*(const int *)b].pi_mount);
+}
 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.
 		 * but if this is the mounted-on root, has no mount
 		 * point defined, or is marked preserve, don't touch it!
 		 */
 		ptn = ptn_order[i];
 		lbl = pm->bsdlabel + ptn;
 		if (is_active_rootpart(pm->diskdev, ptn))
 			continue;
 		if (*lbl->pi_mount == 0)
 			/* No mount point */
 			continue;
 		if (pm->isspecial) {
 			asprintf(&dev, "%s", pm->diskdev);
 			ptn = 0 - 'a';
 		} else {
 			asprintf(&dev, "%s%c", pm->diskdev, 'a' + ptn);
+		}
 		if (dev == NULL)
 			return (ENOMEM);
 		asprintf(&devdev, "/dev/%s", dev);
 		if (devdev == NULL)
 			return (ENOMEM);
 		newfs = NULL;
 		lbl->mnt_opts = NULL;
 		lbl->fsname = NULL;
 		switch (lbl->pi_fstype) {
 		case FS_APPLEUFS:
 			asprintf(&newfs, "/sbin/newfs %s%.0d",
 				lbl->pi_isize != 0 ? "-i" : "", lbl->pi_isize);
 			lbl->mnt_opts = "-tffs -o async";
 			lbl->fsname = "ffs";
 			break;
 		case FS_BSDFFS:
 			asprintf(&newfs,
 			    "/sbin/newfs -V2 -O %d -b %d -f %d%s%.0d",
 			    lbl->pi_flags & PIF_FFSv2 ? 2 : 1,
 			    lbl->pi_fsize * lbl->pi_frag, lbl->pi_fsize,
 			    lbl->pi_isize != 0 ? " -i " : "", lbl->pi_isize);
 			if (lbl->pi_flags & PIF_LOG)
 				lbl->mnt_opts = "-tffs -o log";
 			else
 				lbl->mnt_opts = "-tffs -o async";
 			lbl->fsname = "ffs";
 			break;
 		case FS_BSDLFS:
 			asprintf(&newfs, "/sbin/newfs_lfs -b %d",
 				lbl->pi_fsize * lbl->pi_frag);
 			lbl->mnt_opts = "-tlfs";
 			lbl->fsname = "lfs";
 			break;
 		case FS_MSDOS:
 #ifdef USE_NEWFS_MSDOS
 			asprintf(&newfs, "/sbin/newfs_msdos");
 #endif
 			lbl->mnt_opts = "-tmsdos";
 			lbl->fsname = "msdos";
 			break;
 #ifdef USE_SYSVBFS
 		case FS_SYSVBFS:
 			asprintf(&newfs, "/sbin/newfs_sysvbfs");
 			lbl->mnt_opts = "-tsysvbfs";
 			lbl->fsname = "sysvbfs";
 			break;
 #endif
 #ifdef USE_EXT2FS
 		case FS_EX2FS:
 			asprintf(&newfs, "/sbin/newfs_ext2fs");
 			lbl->mnt_opts = "-text2fs";
 			lbl->fsname = "ext2fs";
 			break;
 #endif
+		}
 		if (lbl->pi_flags & PIF_NEWFS && newfs != NULL) {
 #ifdef USE_NEWFS_MSDOS
 			if (lbl->pi_fstype == FS_MSDOS) {
 			        /* newfs only if mount fails */
 			        if (run_program(RUN_SILENT | RUN_ERROR_OK,
 				    "mount -rt msdos /dev/%s /mnt2", dev) != 0)
 					error = run_program(
 					    RUN_DISPLAY | RUN_PROGRESS,
 					    "%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) {
 			make_target_dir(lbl->pi_mount);
 			error = target_mount_do(lbl->mnt_opts, devdev, lbl->pi_mount);
 			if (error) {
 				msg_display(MSG_mountfail, dev, ' ', lbl->pi_mount);
 				process_menu(MENU_ok, NULL);
 				free(devdev);
 				free(dev);
 				return error;
+			}
+		}
 		free(devdev);
 		free(dev);
+	}
 	return 0;
+}
 int
 make_fstab(void)
+{
 	FILE *f;
 	int i, swap_dev = -1;
 	const char *dump_dev;
 	char *dev = NULL;
 	pm_devs_t *pm_i;
 #ifndef HAVE_TMPFS
 	pm_devs_t *pm_with_swap = NULL;
 #endif
 	/* Create the fstab. */
 	make_target_dir("/etc");
 	f = target_fopen("/etc/fstab", "w");
 	scripting_fprintf(NULL, "cat <<EOF >%s/etc/fstab\n", target_prefix());
 	if (logfp)
 		(void)fprintf(logfp,
 		    "Making %s/etc/fstab (%s).\n", target_prefix(), pm->diskdev);
 	if (f == NULL) {
 		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;
 			if (dev != NULL)
 				free(dev);
 			if (pm_i->isspecial)
 				asprintf(&dev, "%s", pm_i->diskdev);
 			else
 				asprintf(&dev, "%s%c", pm_i->diskdev, 'a' + i);
 			if (dev == NULL)
 				return (ENOMEM);
 			if (!*mp) {
 				/*
 				 * No mount point specified, comment out line and
 				 * use /mnt as a placeholder for the mount point.
 				 */
 				s = "# ";
 				mp = "/mnt";
+			}
 			switch (pm_i->bsdlabel[i].pi_fstype) {
 			case FS_UNUSED:
 				continue;
 			case FS_BSDLFS:
 				/* If there is no LFS, just comment it out. */
 				if (!check_lfs_progs())
 					s = "# ";
 				fstype = "lfs";
 				/* FALLTHROUGH */
 			case FS_BSDFFS:
 				fsck_pass = (strcmp(mp, "/") == 0) ? 1 : 2;
 				dump_freq = 1;
 				break;
 			case FS_MSDOS:
 				fstype = "msdos";
 				break;
 			case FS_SWAP:
 				if (pm_i->isspecial)
 					continue;
 				if (swap_dev == -1) {
 					swap_dev = i;
 					dump_dev = ",dp";
 #ifndef HAVE_TMPFS
 					pm_with_swap = pm_i;
 #endif
 				} else {
 					dump_dev = "";
+				}
 				scripting_fprintf(f, "/dev/%s\t\tnone\tswap\tsw%s\t\t 0 0\n",
 					dev, dump_dev);
 				continue;
 #ifdef USE_SYSVBFS
 			case FS_SYSVBFS:
 				fstype = "sysvbfs";
 				make_target_dir("/stand");
 				break;
 #endif
 			default:
 				fstype = "???";
 				s = "# ";
 				break;
+			}
 			/* The code that remounts root rw doesn't check the partition */
 			if (strcmp(mp, "/") == 0 && !(pm_i->bsdlabel[i].pi_flags & PIF_MOUNT))
 				s = "# ";
 	 		scripting_fprintf(f,
 			  "%s/dev/%s\t\t%s\t%s\trw%s%s%s%s%s%s%s%s\t\t %d %d\n",
 			   s, dev, mp, fstype,
 			   pm_i->bsdlabel[i].pi_flags & PIF_LOG ? ",log" : "",
 			   pm_i->bsdlabel[i].pi_flags & PIF_MOUNT ? "" : ",noauto",
 			   pm_i->bsdlabel[i].pi_flags & PIF_ASYNC ? ",async" : "",
 			   pm_i->bsdlabel[i].pi_flags & PIF_NOATIME ? ",noatime" : "",
 			   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",
 			    tmp_ramdisk_size);
 #endif
+	}
 	/* Add /kern, /proc and /dev/pts to fstab and make mountpoint. */
 	scripting_fprintf(f, "kernfs\t\t/kern\tkernfs\trw\n");
 	scripting_fprintf(f, "ptyfs\t\t/dev/pts\tptyfs\trw\n");
 	scripting_fprintf(f, "procfs\t\t/proc\tprocfs\trw\n");
 	scripting_fprintf(f, "/dev/%s\t\t/cdrom\tcd9660\tro,noauto\n",
 	    get_default_cdrom());
 	scripting_fprintf(f, "%stmpfs\t\t/var/shm\ttmpfs\trw,-m1777,-sram%%25\n",
 	    tmpfs_on_var_shm() ? "" : "#");
 	make_target_dir("/kern");
 	make_target_dir("/proc");
 	make_target_dir("/dev/pts");
 	make_target_dir("/cdrom");
 	make_target_dir("/var/shm");
 	scripting_fprintf(NULL, "EOF\n");
 	if (dev != NULL)
 		free(dev);
 	fclose(f);
 	fflush(NULL);
 	return 0;
+}
 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
 static int
 /*ARGSUSED*/
 foundsysvbfs(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 = 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
  * Additional prs regarding the original issue include:
  *  bin/17910 kern/21283 kern/21404 port-macppc/23925 port-macppc/23926
  */
 static void
 fixsb(const char *prog, const char *disk, char ptn)
+{
 	int fd;
 	int rval;
 	union {
 		struct fs fs;
 		char buf[SBLOCKSIZE];
 	} sblk;
 	struct fs *fs = &sblk.fs;
 	snprintf(sblk.buf, sizeof(sblk.buf), "/dev/r%s%c",
 		disk, ptn == ' ' ? 0 : ptn);
 	fd = open(sblk.buf, O_RDONLY);
 	if (fd == -1)
 		return;
 	/* Read ffsv1 main superblock */
 	rval = pread(fd, sblk.buf, sizeof sblk.buf, SBLOCK_UFS1);
 	close(fd);
 	if (rval != sizeof sblk.buf)
 		return;
 	if (fs->fs_magic != FS_UFS1_MAGIC &&
 	    fs->fs_magic != FS_UFS1_MAGIC_SWAPPED)
 		/* Not FFSv1 */
 		return;
 	if (fs->fs_old_flags & FS_FLAGS_UPDATED)
 		/* properly updated fslevel 4 */
 		return;
 	if (fs->fs_bsize != fs->fs_maxbsize)
 		/* not messed up */
 		return;
 	/*
 	 * OK we have a munged fs, first 'upgrade' to fslevel 4,
 	 * We specify -b16 in order to stop fsck bleating that the
 	 * sb doesn't match the first alternate.
 	 */
 	run_program(RUN_DISPLAY | RUN_PROGRESS,
 	    "%s -p -b 16 -c 4 /dev/r%s%c", prog, disk, ptn);
 	/* Then downgrade to fslevel 3 */
 	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, "");
+}
 /* Get information on the file systems mounted from the root filesystem.
  * Offer to convert them into 4.4BSD inodes if they are not 4.4BSD
  * inodes.  Fsck them.  Mount them.
  */
 int
 mount_disks(void)
+{
 	char *fstab;
 	int   fstabsize;
 	int   error;
 	static struct lookfor fstabbuf[] = {
 		{"/dev/", "/dev/%s %s ffs %s", "c", NULL, 0, 0, foundffs},
 		{"/dev/", "/dev/%s %s ufs %s", "c", NULL, 0, 0, foundffs},
 #ifdef USE_SYSVBFS
 		{"/dev/", "/dev/%s %s sysvbfs %s", "c", NULL, 0, 0,
 		    foundsysvbfs},
 #endif
 	};
 	static size_t numfstabbuf = sizeof(fstabbuf) / sizeof(struct lookfor);
 	/* First the root device. */
 	if (target_already_root())
 		/* avoid needing to call target_already_root() again */
 		targetroot_mnt[0] = 0;
 	else {
 		error = mount_root();
 		if (error != 0 && error != EBUSY)
 			return -1;
+	}
 	/* Check the target /etc/fstab exists before trying to parse it. */
 	if (target_dir_exists_p("/etc") == 0 ||
 	    target_file_exists_p("/etc/fstab") == 0) {
 		msg_display(MSG_noetcfstab, pm->diskdev);
 		process_menu(MENU_ok, NULL);
 		return -1;
+	}
 	/* Get fstab entries from the target-root /etc/fstab. */
 	fstabsize = target_collect_file(T_FILE, &fstab, "/etc/fstab");
 	if (fstabsize < 0) {
 		/* error ! */
 		msg_display(MSG_badetcfstab, pm->diskdev);
 		process_menu(MENU_ok, NULL);
 		return -2;
+	}
 	error = walk(fstab, (size_t)fstabsize, fstabbuf, numfstabbuf);
 	free(fstab);
 	return error;
+}
 int
 set_swap_if_low_ram(const char *disk, partinfo *pp)
+{
 	if (get_ramsize() <= 32)
 		return set_swap(disk, pp);
 	return 0;
+}
 int
 set_swap(const char *disk, partinfo *pp)
+{
 	int i;
 	char *cp;
 	int rval;
 	if (pp == NULL)
 		pp = pm->oldlabel;
 	for (i = 0; i < MAXPARTITIONS; i++) {
 		if (pp[i].pi_fstype != FS_SWAP)
 			continue;
 		asprintf(&cp, "/dev/%s%c", disk, 'a' + i);
 		rval = swapctl(SWAP_ON, cp, 0);
 		free(cp);
 		if (rval != 0)
 			return -1;
+	}
 	return 0;
+}
 int
 check_swap(const char *disk, int remove_swap)
+{
 	struct swapent *swap;
 	char *cp;
 	int nswap;
 	int l;
 	int rval = 0;
 	nswap = swapctl(SWAP_NSWAP, 0, 0);
 	if (nswap <= 0)
 		return 0;
 	swap = malloc(nswap * sizeof *swap);
 	if (swap == NULL)
 		return -1;
 	nswap = swapctl(SWAP_STATS, swap, nswap);
 	if (nswap < 0)
 		goto bad_swap;
 	l = strlen(disk);
 	while (--nswap >= 0) {
 		/* Should we check the se_dev or se_path? */
 		cp = swap[nswap].se_path;
 		if (memcmp(cp, "/dev/", 5) != 0)
 			continue;
 		if (memcmp(cp + 5, disk, l) != 0)
 			continue;
 		if (!isalpha(*(unsigned char *)(cp + 5 + l)))
 			continue;
 		if (cp[5 + l + 1] != 0)
 			continue;
 		/* ok path looks like it is for this device */
 		if (!remove_swap) {
 			/* count active swap areas */
 			rval++;
 			continue;
+		}
 		if (swapctl(SWAP_OFF, cp, 0) == -1)
 			rval = -1;
+	}
     done:
 	free(swap);
 	return rval;
     bad_swap:
 	rval = -1;
 	goto done;
+}
 #ifdef HAVE_BOOTXX_xFS
 char *
 bootxx_name(void)
+{
 	int fstype;
 	const char *bootxxname;
 	char *bootxx;
 	/* check we have boot code for the root partition type */
 	fstype = pm->bsdlabel[pm->rootpart].pi_fstype;
 	switch (fstype) {
 #if defined(BOOTXX_FFSV1) || defined(BOOTXX_FFSV2)
 	case FS_BSDFFS:
 		if (pm->bsdlabel[pm->rootpart].pi_flags & PIF_FFSv2) {
 #ifdef BOOTXX_FFSV2
 			bootxxname = BOOTXX_FFSV2;
 #else
 			bootxxname = NULL;
 #endif
 		} else {
 #ifdef BOOTXX_FFSV1
 			bootxxname = BOOTXX_FFSV1;
 #else
 			bootxxname = NULL;
 #endif
+		}
 		break;
 #endif
 #ifdef BOOTXX_LFSV2
 	case FS_BSDLFS:
 		bootxxname = BOOTXX_LFSV2;
 		break;
 #endif
 	default:
 		bootxxname = NULL;
 		break;
+	}
 	if (bootxxname == NULL)
 		return NULL;
 	asprintf(&bootxx, "%s/%s", BOOTXXDIR, bootxxname);
 	return bootxx;
+}
 #endif
 static int
 get_fsid_by_gptuuid(const char *str)
+{
 	int i;
 	uuid_t uuid;
 	uint32_t status;
 	uuid_from_string(str, &uuid, &status);
 	if (status == uuid_s_ok) {
 		for (i = 0; gpt_filesystems[i].id > 0; i++)
 			if (uuid_equal(&uuid, &(gpt_filesystems[i].uuid), NULL))
 				return gpt_filesystems[i].id;
+	}
 	return FS_OTHER;
+}
 const char *
 get_gptfs_by_id(int filesystem)
+{
 	int i;
 	for (i = 0; gpt_filesystems[i].id > 0; i++)
 		if (filesystem == gpt_filesystems[i].id)
 			return gpt_filesystems[i].name;
 	return NULL;
+}
 /* from dkctl.c */
 static int
 get_dkwedges_sort(const void *a, const void *b)
+{
 	const struct dkwedge_info *dkwa = a, *dkwb = b;
 	const daddr_t oa = dkwa->dkw_offset, ob = dkwb->dkw_offset;
 	return (oa < ob) ? -1 : (oa > ob) ? 1 : 0;
+}
 int
 get_dkwedges(struct dkwedge_info **dkw, const char *diskdev)
+{
 	int fd;
 	char buf[STRSIZE];
 	size_t bufsize;
 	struct dkwedge_list dkwl;
 	*dkw = NULL;
 	dkwl.dkwl_buf = *dkw;
 	dkwl.dkwl_bufsize = 0;
 	fd = opendisk(diskdev, O_RDONLY, buf, STRSIZE, 0);
 	if (fd < 0)
 		return -1;
 	for (;;) {
 		if (ioctl(fd, DIOCLWEDGES, &dkwl) == -1)
 			return -2;
 		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)
 				return -3;
 			dkwl.dkwl_buf = *dkw;
 			dkwl.dkwl_bufsize = bufsize;
+		}
+	}
 	if (dkwl.dkwl_nwedges > 0 && *dkw != NULL)
 		qsort(*dkw, dkwl.dkwl_nwedges, sizeof(**dkw), get_dkwedges_sort);
 	close(fd);
 	return dkwl.dkwl_nwedges;
+}
 /* XXX: rewrite */
 static int
 incoregpt(pm_devs_t *pm_cur, partinfo *lp)
+{
 	int i, num;
 	unsigned int p_num;
 	uint64_t p_start, p_size;
 	char *textbuf, *t, *tt, p_type[STRSIZE];
 	struct dkwedge_info *dkw;
 	num = get_dkwedges(&dkw, pm_cur->diskdev);
 	if (dkw != NULL) {
 		for (i = 0; i < num && i < MAX_WEDGES; i++)
 			run_program(RUN_SILENT, "dkctl %s delwedge %s",
 				pm_cur->diskdev, dkw[i].dkw_devname);
 		free (dkw);
+	}
 	if (collect(T_OUTPUT, &textbuf, "gpt show -u %s 2>/dev/null", pm_cur->diskdev) < 1)
 		return -1;
 	(void)strtok(textbuf, "\n"); /* ignore first line */
 	while ((t = strtok(NULL, "\n")) != NULL) {
 		i = 0; p_start = 0; p_size = 0; p_num = 0; strcpy(p_type, ""); /* init */
 		while ((tt = strsep(&t, " \t")) != NULL) {
 			if (strlen(tt) == 0)
 				continue;
 			if (i == 0)
 				p_start = strtouq(tt, NULL, 10);
 			if (i == 1)
 				p_size = strtouq(tt, NULL, 10);
 			if (i == 2)
 				p_num = strtouq(tt, NULL, 10);
 			if (i > 2 || (i == 2 && p_num == 0))
 				if (
 					strcmp(tt, "GPT") &&
 					strcmp(tt, "part") &&
 					strcmp(tt, "-")
+					)
 						strlcat(p_type, tt, STRSIZE);
 			i++;
+		}
 		if (p_start == 0 || p_size == 0)
 			continue;
 		else if (! strcmp(p_type, "Pritable"))
 			pm_cur->ptstart = p_start + p_size;
 		else if (! strcmp(p_type, "Sectable"))
 			pm_cur->ptsize = p_start - pm_cur->ptstart - 1;
 		else if (p_num == 0 && strlen(p_type) > 0)
 			/* Utilitary entry (PMBR, etc) */
 			continue;
 		else if (p_num == 0) {
 			/* Free space */
 			continue;
 		} else {
 			/* Usual partition */
 			lp[p_num].pi_size = p_size;
 			lp[p_num].pi_offset = p_start;
 			lp[p_num].pi_fstype = get_fsid_by_gptuuid(p_type);
+		}
+	}
 	free(textbuf);
 	return 0;
+}
 static bool
 is_gpt(const char *dev)
+{
 	check_available_binaries();
 	if (!have_gpt)
 		return false;
 	return run_program(RUN_SILENT | RUN_ERROR_OK,
 		"gpt -qr header %s", dev) == 0;
+}

 @@ -1,1903 +1,1906 @@
-/*	$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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of Piermont Information Systems Inc. may not be used to endorse
  *    or promote products derived from this software without specific prior
  *    written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``AS IS''
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PIERMONT INFORMATION SYSTEMS INC. BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 /*
  * Following applies to the geometry guessing code
  */
 /*
  * Mach Operating System
  * Copyright (c) 1992 Carnegie Mellon University
  * All Rights Reserved.
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
  * Carnegie Mellon requests users of this software to return to
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
 /* mbr.c -- DOS Master Boot Record editing code */
 #include <sys/param.h>
 #include <sys/types.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <util.h>
 #include "defs.h"
 #include "mbr.h"
 #include "md.h"
 #include "msg_defs.h"
 #include "menu_defs.h"
 #include "endian.h"
 #define NO_BOOTMENU (-0x100)
 #define MAXCYL		1023    /* Possibly 1024 */
 #define MAXHEAD		255     /* Possibly 256 */
 #define MAXSECTOR	63
 struct part_id {
 	int id;
 	const char *name;
 } part_ids[] = {
 	{0,			"unused"},
 	{MBR_PTYPE_NETBSD,	"NetBSD"},
 	{MBR_PTYPE_EXT_LBA,	"Extended partition, LBA"},
 	{MBR_PTYPE_386BSD,	"FreeBSD/386BSD"},
 	{MBR_PTYPE_OPENBSD,	"OpenBSD"},
 	{MBR_PTYPE_LNXEXT2,	"Linux native"},
 	{MBR_PTYPE_LNXSWAP,	"Linux swap"},
 	{MBR_PTYPE_FAT12,	"DOS FAT12"},
 	{MBR_PTYPE_FAT16S,	"DOS FAT16, <32M"},
 	{MBR_PTYPE_FAT16B,	"DOS FAT16, >32M"},
 	{MBR_PTYPE_FAT16L,	"Windows FAT16, LBA"},
 	{MBR_PTYPE_FAT32,	"Windows FAT32"},
 	{MBR_PTYPE_FAT32L,	"Windows FAT32, LBA"},
 	{MBR_PTYPE_NTFSVOL,	"NTFS volume set"},
 	{MBR_PTYPE_NTFS,	"NTFS"},
 	{MBR_PTYPE_PREP,	"PReP Boot"},
 #ifdef MBR_PTYPE_SOLARIS
 	{MBR_PTYPE_SOLARIS,	"Solaris"},
 #endif
 	{-1,			"Unknown"},
 };
 static int get_mapping(struct mbr_partition *, int, int *, int *, int *,
 			    daddr_t *);
 static void convert_mbr_chs(int, int, int, uint8_t *, uint8_t *,
 				 uint8_t *, uint32_t);
 static void get_ptn_alignment(struct mbr_partition *);
 static unsigned int ptn_alignment;
 static unsigned int ptn_0_offset;
 /*
  * Notes on the extended partition editor.
+ *
  * The extended partition structure is actually a singly linked list.
  * Each of the 'mbr' sectors can only contain 2 items, the first describes
  * a user partition (relative to that mbr sector), the second describes
  * the following partition (relative to the start of the extended partition).
+ *
  * The 'start' sector for the user partition is always the size of one
  * track - very often 63.  The extended partitions themselves should
  * always start on a cylinder boundary using the BIOS geometry - often
  * 16065 sectors per cylinder.
+ *
  * The disk is also always described in increasing sector order.
+ *
  * During editing we keep the mbr sectors accurate (it might have been
  * easier to use absolute sector numbers though), and keep a copy of the
  * entire sector - to preserve any information any other OS has tried
  * to squirrel away in the (apparently) unused space.
+ *
  * For simplicity we add entries for unused space.  These should not
  * get written to the disk.
+ *
  * Typical disk (with some small numbers):
+ *
  *      0 -> a       63       37	dos
  *           b      100     1000	extended LBA (type 15)
+ *
  *    100 -> a       63       37        user
  *           b      100      200	extended partiton (type 5)
+ *
  *    200 -> a       63       37        user
  *           b      200      300	extended partiton (type 5)
+ *
  *    300 -> a       63       37	user
  *           b        0        0        0 (end of chain)
+ *
  * If there is a gap, the 'b' partition will start beyond the area
  * described by the 'a' partition.
+ *
  * While writing this comment, I can't remember what happens is there
  * is space at the start of the extended partition.
  */
 #ifndef debug_extended
 #define dump_mbr(mbr, msg)
 #else
 void
 dump_mbr(mbr_info_t *mbr, const char *msg)
+{
 	int i;
 	fprintf(stderr, "%s: bsec %d\n", msg, bsec);
 	do {
 		fprintf(stderr, "%9p: %9d %9p %6.6s:",
 		    mbr, mbr->sector, mbr->extended,
 		    mbr->prev_ext, mbr->last_mounted);
 		for (i = 0; i < 4; i++)
 			fprintf(stderr, " %*d %9d %9d %9d,\n",
 			    i ? 41 : 3,
 			    mbr->mbr.mbr_parts[i].mbrp_type,
 			    mbr->mbr.mbr_parts[i].mbrp_start,
 			    mbr->mbr.mbr_parts[i].mbrp_size,
 			    mbr->mbr.mbr_parts[i].mbrp_start +
 				mbr->mbr.mbr_parts[i].mbrp_size);
 	} while ((mbr = mbr->extended));
+}
 #endif
 /*
  * To be used only on ports which cannot provide any bios geometry
  */
 int
 set_bios_geom_with_mbr_guess(void)
+{
 	int cyl, head;
 	daddr_t sec;
 	read_mbr(pm->diskdev, &mbr);
 	msg_display(MSG_nobiosgeom, pm->dlcyl, pm->dlhead, pm->dlsec);
 	if (guess_biosgeom_from_mbr(&mbr, &cyl, &head, &sec) >= 0)
 		msg_display_add(MSG_biosguess, cyl, head, sec);
 	set_bios_geom(cyl, head, sec);
 	return edit_mbr(&mbr);
+}
 /*
  * get C/H/S geometry from user via menu interface and
  * store in globals.
  */
 void
 set_bios_geom(int cyl, int head, int sec)
+{
 	char res[80];
 	msg_display_add(MSG_setbiosgeom);
 	do {
 		snprintf(res, 80, "%d", sec);
 		msg_prompt_add(MSG_sectors, res, res, 80);
 		bsec = atoi(res);
 	} while (bsec <= 0 || bsec > 63);
 	do {
 		snprintf(res, 80, "%d", head);
 		msg_prompt_add(MSG_heads, res, res, 80);
 		bhead = atoi(res);
 	} while (bhead <= 0 || bhead > 256);
 	bcyl = pm->dlsize / bsec / bhead;
 	if (pm->dlsize != bcyl * bsec * bhead)
 		bcyl++;
+}
 #ifdef notdef
 void
 disp_cur_geom(void)
+{
 	msg_display_add(MSG_realgeom, pm->dlcyl, pm->dlhead, pm->dlsec);
 	msg_display_add(MSG_biosgeom, bcyl, bhead, bsec);
+}
 #endif
 /*
  * Then,  the partition stuff...
  */
 /*
  * If we change the mbr partitioning, the we must remove any references
  * in the netbsd disklabel to the part we changed.
  */
 static void
 remove_old_partitions(uint start, int64_t size)
+{
 	partinfo *p;
 	uint end;
 	if (size > 0) {
 		end = start + size;
 	} else {
 		end = start;
 		start = end - size;
+	}
 	if (end == 0)
 		return;
 	for (p = pm->oldlabel; p < pm->oldlabel + nelem(pm->oldlabel); p++) {
 		if (p->pi_offset >= end || p->pi_offset + p->pi_size <= start)
 			continue;
 		memset(p, 0, sizeof *p);
+	}
+}
 static int
 find_mbr_space(struct mbr_sector *mbrs, uint *start, uint *size, uint from, int ignore)
+{
 	uint sz;
 	int i;
 	uint s, e;
     check_again:
 	sz = pm->dlsize - from;
 	for (i = 0; i < MBR_PART_COUNT; i++) {
 		if (i == ignore)
 			continue;
 		s = mbrs->mbr_parts[i].mbrp_start;
 		e = s + mbrs->mbr_parts[i].mbrp_size;
 		if (s <= from && e > from) {
 			from = e;
 			goto check_again;
+		}
 		if (s > from && s - from < sz)
 			sz = s - from;
+	}
 	if (sz == 0)
 		return -1;
 	if (start != NULL)
 		*start = from;
 	if (size != NULL)
 		*size = sz;
 	return 0;
+}
 static struct mbr_partition *
 get_mbrp(mbr_info_t **mbrip, int opt)
+{
 	mbr_info_t *mbri = *mbrip;
 	if (opt >= MBR_PART_COUNT)
 		for (opt -= MBR_PART_COUNT - 1; opt; opt--)
 			mbri = mbri->extended;
 	*mbrip = mbri;
 	return &mbri->mbr.mbr_parts[opt];
+}
 static int
 err_msg_win(const char *errmsg)
+{
 	const char *cont;
 	int l, l1;
 	errmsg = msg_string(errmsg);
 	cont = msg_string(MSG_Hit_enter_to_continue);
 	l = strlen(errmsg);
 	l1 = strlen(cont);
 	if (l < l1)
 		l = l1;
 	msg_prompt_win("%s.\n%s", -1, 18, l + 5, 4,
 			NULL, NULL, 1, errmsg, cont);
 	return 0;
+}
 static int
 set_mbr_type(menudesc *m, void *arg)
+{
 	mbr_info_t *mbri = arg;
 	mbr_info_t *ombri = arg;
 	mbr_info_t *ext;
 	struct mbr_partition *mbrp;
 	char *cp;
 	int opt = mbri->opt;
 	int type;
 	u_int start, sz;
 	int i;
 	char numbuf[5];
 	dump_mbr(ombri, "set type");
 	mbrp = get_mbrp(&mbri, opt);
 	if (opt >= MBR_PART_COUNT)
 		opt = 0;
 	type = m->cursel;
 	if (type == 0)
 		return 1;
 	type = part_ids[type - 1].id;
 	while (type == -1) {
 		snprintf(numbuf, sizeof numbuf, "%u", mbrp->mbrp_type);
 		msg_prompt_win(MSG_get_ptn_id, -1, 18, 0, 0,
 			numbuf, numbuf, sizeof numbuf);
 		type = strtoul(numbuf, &cp, 0);
 		if (*cp != 0)
 			type = -1;
+	}
 	if (type == mbrp->mbrp_type)
 		/* type not changed... */
 		return 1;
 	mbri->last_mounted[opt < MBR_PART_COUNT ? opt : 0] = NULL;
 	if (MBR_IS_EXTENDED(mbrp->mbrp_type)) {
 		/* deleting extended partition.... */
 		if (mbri->sector || mbri->extended->extended)
 			/* We should have stopped this happening... */
 			return err_msg_win("can't delete extended");
 		free(mbri->extended);
 		mbri->extended = NULL;
+	}
 	if (type == 0) {
 		/* Deleting partition */
 		mbrp->mbrp_type = 0;
 		/* Remove references to this space from the NetBSD label */
 		remove_old_partitions(mbri->sector + mbrp->mbrp_start,
 		    mbrp->mbrp_size);
 #ifdef BOOTSEL
 		if (ombri->bootsec == mbri->sector + mbrp->mbrp_start)
 			ombri->bootsec = 0;
 		memset(mbri->mbrb.mbrbs_nametab[opt], 0,
 		    sizeof mbri->mbrb.mbrbs_nametab[opt]);
 #endif
 		if (mbri->sector == 0) {
 			/* A main partition */
 			memset(mbrp, 0, sizeof *mbrp);
 			return 1;
+		}
 		/* Merge with previous and next free areas */
 		ext = mbri->prev_ext;
 		if (ext != NULL && ext->mbr.mbr_parts[0].mbrp_type == 0) {
 			/* previous was free - back up one entry */
 			mbri = ext;
 			ombri->opt--;
+		}
 		while ((ext = mbri->extended)) {
 			if (ext->mbr.mbr_parts[0].mbrp_type != 0)
 				break;
 			sz = ext->mbr.mbr_parts[0].mbrp_start +
 						ext->mbr.mbr_parts[0].mbrp_size;
 			/* Increase size of our (empty) partition */
 			mbri->mbr.mbr_parts[0].mbrp_size += sz;
 			/* Make us describe the next partition */
 			mbri->mbr.mbr_parts[1] = ext->mbr.mbr_parts[1];
 			/* fix list of extended partitions */
 			mbri->extended = ext->extended;
 			if (ext->extended != NULL)
 				ext->extended->prev_ext = mbri;
 			free(ext);
 			/* Make previous size cover all our ptn */
 			ext = mbri->prev_ext;
 			if (ext != NULL)
 				ext->mbr.mbr_parts[1].mbrp_size += sz;
+		}
 		return 1;
+	}
 	if (mbrp->mbrp_start == 0) {
 		/* Find first chunk of space... */
 		/* Must be in the main partition */
 		if (mbri->sector != 0)
 			/* shouldn't be possible to have null start... */
 			return err_msg_win("main-extended mixup");
 		if (find_mbr_space(&mbri->mbr, &start, &sz, bsec, -1) != 0)
 			/* no space */
 			return err_msg_win(MSG_No_free_space);
 		mbrp->mbrp_start = start;
 		mbrp->mbrp_size = sz;
 		/* If there isn't an active partition mark this one active */
 		if (!MBR_IS_EXTENDED(type)) {
 			for (i = 0; i < MBR_PART_COUNT; i++)
 				if (mbri->mbr.mbr_parts[i].mbrp_flag != 0)
 					break;
 			if (i == MBR_PART_COUNT)
 				mbrp->mbrp_flag = MBR_PFLAG_ACTIVE;
+		}
+	}
 	if (MBR_IS_EXTENDED(type)) {
 		if (mbri->sector != 0)
 			/* Can't set extended partition in an extended one */
 			return err_msg_win(MSG_Only_one_extended_ptn);
 		if (mbri->extended)
 			/* Can't have two extended partitions */
 			return err_msg_win(MSG_Only_one_extended_ptn);
 		/* Create new extended partition */
 		ext = calloc(1, sizeof *mbri->extended);
 		if (!ext)
 			return 0;
 		mbri->extended = ext;
 		ext->sector = mbrp->mbrp_start;
 		ext->mbr.mbr_parts[0].mbrp_start = ptn_0_offset;
 		ext->mbr.mbr_parts[0].mbrp_size =
 		    mbrp->mbrp_size - ptn_0_offset;
+	}
 	mbrp->mbrp_type = type;
 	return 1;
+}
 static void
 set_type_label(menudesc *m, int opt, void *arg)
+{
 	if (opt == 0) {
 		wprintw(m->mw, "%s", msg_string(MSG_Dont_change));
 		return;
+	}
 	if (opt == 1) {
 		wprintw(m->mw, "%s", msg_string(MSG_Delete_partition));
 		return;
+	}
 	if (part_ids[opt - 1].id == -1) {
 		wprintw(m->mw, "%s", msg_string(MSG_Other_kind));
 		return;
+	}
 	wprintw(m->mw, "%s", part_ids[opt - 1].name);
+}
 static int
 edit_mbr_type(menudesc *m, void *arg)
+{
 	static menu_ent type_opts[1 + nelem(part_ids)];
 	static int type_menu = -1;
 	unsigned int i;
 	if (type_menu == -1) {
 		for (i = 0; i < nelem(type_opts); i++) {
 			type_opts[i].opt_menu = OPT_NOMENU;
 			type_opts[i].opt_action = set_mbr_type;
+		}
 		type_menu = new_menu(NULL, type_opts, nelem(type_opts),
 , 12, 0, 30,
 			MC_SUBMENU | MC_SCROLL | MC_NOEXITOPT | MC_NOCLEAR,
 			NULL, set_type_label, NULL,
 			NULL, NULL);
+	}
 	if (type_menu != -1)
 		process_menu(type_menu, arg);
 	return 0;
+}
 static int
 edit_mbr_start(menudesc *m, void *arg)
+{
 	mbr_info_t *mbri = arg;
 	mbr_info_t *ext;
 	struct mbr_partition *mbrp;
 	int opt = mbri->opt;
 	uint start, sz;
 	uint new_r, new, limit, dflt_r;
 	int64_t delta;
 	const char *errmsg;
 	char *cp;
 	struct {
 		uint	start;
 		uint	start_r;
 		uint	limit;
 	} freespace[MBR_PART_COUNT];
 	unsigned int spaces;
 	unsigned int i;
 	char prompt[MBR_PART_COUNT * 60];
 	unsigned int len;
 	char numbuf[12];
 	if (opt >= MBR_PART_COUNT)
 		/* should not be able to get here... */
 		return 1;
 	mbrp = mbri->mbr.mbr_parts + opt;
 	/* locate the start of all free areas */
 	spaces = 0;
 	for (start = bsec, i = 0; i < MBR_PART_COUNT; start += sz, i++) {
 		if (find_mbr_space(&mbri->mbr, &start, &sz, start, opt))
 			break;
 		if (MBR_IS_EXTENDED(mbrp->mbrp_type)) {
 			/* Only want the area that contains this partition */
 			if (mbrp->mbrp_start < start ||
 			    mbrp->mbrp_start >= start + sz)
 				continue;
 			i = MBR_PART_COUNT - 1;
+		}
 		freespace[spaces].start = start;
 		freespace[spaces].start_r = start / sizemult;
 		freespace[spaces].limit = start + sz;
 		if (++spaces >= sizeof freespace)
 			/* shouldn't happen... */
 			break;
+	}
 	/* Add description of start/size to user prompt */
 	len = 0;
 	for (i = 0; i < spaces; i++) {
 		len += snprintf(prompt + len, sizeof prompt - len,
 		    msg_string(MSG_ptn_starts),
 		    freespace[i].start_r,
 		    freespace[i].limit / sizemult, multname,
 		    freespace[i].limit / sizemult - freespace[i].start_r,
 		    multname);
 		if (len >= sizeof prompt)
 			break;
+	}
 	/* And loop until the user gives a sensible answer */
 	dflt_r = mbrp->mbrp_start / sizemult;
 	errmsg = "";
 	for (;;) {
 		snprintf(numbuf, sizeof numbuf, "%d", dflt_r);
 		msg_prompt_win(MSG_get_ptn_start, -1, 18, 60, spaces + 3,
 			numbuf, numbuf, sizeof numbuf,
 			prompt, msg_string(errmsg), multname);
 		new_r = strtoul(numbuf, &cp, 0);
 		if (*cp != 0) {
 			errmsg = MSG_Invalid_numeric;
 			continue;
+		}
 		if (new_r == dflt_r)
 			/* Unchanged */
 			return 0;
 		/*
 		 * Check that the start address from the user is inside one
 		 * of the free areas.
 		 */
 		new = new_r * sizemult;
 		for (i = 0; i < spaces; i++) {
 			if (new_r == freespace[i].start_r) {
 				new = freespace[i].start;
 				break;
+			}
 			if (new >= freespace[i].start &&
 			    new < freespace[i].limit)
 				break;
+		}
 		if (i >= spaces) {
 			errmsg = MSG_Space_allocated;
 			continue;
+		}
 		limit = freespace[i].limit;
 		/*
 		 * We can only increase the start of an extended partition
 		 * if the corresponding space inside the partition isn't used.
 		 */
 		if (new > mbrp->mbrp_start &&
 		    MBR_IS_EXTENDED(mbrp->mbrp_type) &&
 		    (mbri->extended->mbr.mbr_parts[0].mbrp_type != 0 ||
 			    mbri->extended->mbr.mbr_parts[0].mbrp_size <
 						new - mbrp->mbrp_start)) {
 			errmsg = MSG_Space_allocated;
 			continue;
+		}
 		break;
+	}
 	if (new < mbrp->mbrp_start + mbrp->mbrp_size &&
 	    limit > mbrp->mbrp_start)
 		/* Keep end of partition in the same place */
 		limit = mbrp->mbrp_start + mbrp->mbrp_size;
 	delta = new - mbrp->mbrp_start;
 	if (MBR_IS_EXTENDED(mbrp->mbrp_type)) {
 		ext = mbri->extended;
 		if (ext->mbr.mbr_parts[0].mbrp_type != 0) {
 			/* allocate an extended ptn for the free item */
 			ext = calloc(1, sizeof *ext);
 			if (!ext)
 				return 0;
 			ext->sector = mbrp->mbrp_start;
 			ext->extended = mbri->extended;
 			mbri->extended->prev_ext = ext;
 			mbri->extended = ext;
 			ext->mbr.mbr_parts[0].mbrp_start = bsec;
 			ext->mbr.mbr_parts[0].mbrp_size = -bsec;
 			ext->mbr.mbr_parts[1].mbrp_type = MBR_PTYPE_EXT;
 			ext->mbr.mbr_parts[1].mbrp_start = 0;
 			ext->mbr.mbr_parts[1].mbrp_size =
 				ext->extended->mbr.mbr_parts[0].mbrp_start +
 				ext->extended->mbr.mbr_parts[0].mbrp_size;
+		}
 		/* adjust size of first free item */
 		ext->mbr.mbr_parts[0].mbrp_size -= delta;
 		ext->sector += delta;
 		/* and the link of all extended partitions */
 		do
 			if (ext->extended)
 				ext->mbr.mbr_parts[1].mbrp_start -= delta;
 		while ((ext = ext->extended));
+	}
 	remove_old_partitions(mbri->sector + mbrp->mbrp_start, delta);
 	/* finally set partition base and size */
 	mbrp->mbrp_start = new;
 	mbrp->mbrp_size = limit - new;
 	mbri->last_mounted[opt] = NULL;
 	return 0;
+}
 static int
 edit_mbr_size(menudesc *m, void *arg)
+{
 	mbr_info_t *mbri = arg;
 	mbr_info_t *ombri = arg;
 	mbr_info_t *ext;
 	struct mbr_partition *mbrp;
 	int opt = mbri->opt;
 	uint start, max, max_r, dflt, dflt_r, new;
 	uint freespace;
 	int delta;
 	char numbuf[12];
 	char *cp;
 	const char *errmsg;
 	mbrp = get_mbrp(&mbri, opt);
 	dflt = mbrp->mbrp_size;
 	if (opt < MBR_PART_COUNT) {
 		max = 0;
 		find_mbr_space(&mbri->mbr, &start, &max, mbrp->mbrp_start, opt);
 		if (start != mbrp->mbrp_start)
 			return 0;
 		if (dflt == 0)
 			dflt = max;
 	} else {
 		ext = mbri->extended;
 		max = dflt;
 		/*
 		 * If the next extended partition describes a free area,
 		 * then merge it onto this area.
 		 */
 		if (ext != NULL && ext->mbr.mbr_parts[0].mbrp_type == 0) {
 			if (ext->extended)
 				ext->extended->prev_ext = mbri;
 			mbri->extended = ext->extended;
 			if (mbri->prev_ext)
 				mbri->prev_ext->mbr.mbr_parts[1].mbrp_size
 					+= mbri->mbr.mbr_parts[1].mbrp_size;
 			mbrp->mbrp_size += mbri->mbr.mbr_parts[1].mbrp_size;
 			max += mbri->mbr.mbr_parts[1].mbrp_size;
 			mbri->mbr.mbr_parts[1] = ext->mbr.mbr_parts[1];
 			free(ext);
+		}
+	}
 	start = mbri->sector + mbrp->mbrp_start;
 	/* We need to keep both the unrounded and rounded (_r) max and dflt */
 	dflt_r = (start + dflt) / sizemult - start / sizemult;
 	if (max == dflt)
 		max_r = dflt_r;
 	else
 		max_r = max / sizemult;
 	for (errmsg = "";;) {
 		snprintf(numbuf, sizeof numbuf, "%d", dflt_r);
 		msg_prompt_win(MSG_get_ptn_size, -1, 18, 0, 0,
 			numbuf, numbuf, sizeof numbuf,
 			msg_string(errmsg), max_r, multname);
 		new = strtoul(numbuf, &cp, 0);
 		if (*cp != 0) {
 			errmsg = MSG_Invalid_numeric;
 			continue;
+		}
 		if (new > max_r) {
 			errmsg = MSG_Too_large;
 			continue;
+		}
 		if (new == 0)
 			/* Treat zero as a request for the maximum */
 			new = max_r;
 		if (new == dflt_r)
 			/* If unchanged, don't re-round size */
 			new = dflt;
 		else {
 			/* Round end to the partition alignment */
 			if (sizemult != 1) {
 				new *= sizemult;
 				new += rounddown(start, ptn_alignment);
 				new = roundup(new, ptn_alignment);
 				new -= start;
 				while (new <= 0)
 					new += ptn_alignment;
+			}
+		}
 		if (new > max)
 			/* We rounded the value to above the max */
 			new = max;
 		if (new == dflt || opt >= MBR_PART_COUNT
 		    || !MBR_IS_EXTENDED(mbrp->mbrp_type))
 			break;
 		/*
 		 * We've been asked to change the size of the main extended
 		 * partition.  If this reduces the size, then that space
 		 * must be unallocated.  If it increases the size then
 		 * we must add a description ofthe new free space.
 		 */
 		/* Find last extended partition */
 		for (ext = mbri->extended; ext->extended; ext = ext->extended)
 			continue;
 		if ((new < dflt && (ext->mbr.mbr_parts[0].mbrp_type != 0
 			    || (mbrp->mbrp_start + new < ext->sector + bsec
 				&& mbrp->mbrp_start + new != ext->sector)))
 		    || (new > dflt && ext->mbr.mbr_parts[0].mbrp_type != 0
 							&& new < dflt + bsec)) {
 			errmsg = MSG_Space_allocated;
 			continue;
+		}
 		delta = new - dflt;
 		if (ext->mbr.mbr_parts[0].mbrp_type == 0) {
 			/* adjust size of last item (free space) */
 			if (mbrp->mbrp_start + new == ext->sector) {
 				/* kill last extended ptn */
 				ext = ext->prev_ext;
 				free(ext->extended);
 				ext->extended = NULL;
 				memset(&ext->mbr.mbr_parts[1], 0,
 					sizeof ext->mbr.mbr_parts[1]);
 				break;
+			}
 			ext->mbr.mbr_parts[0].mbrp_size += delta;
 			ext = ext->prev_ext;
 			if (ext != NULL)
 				ext->mbr.mbr_parts[1].mbrp_size += delta;
 			break;
+		}
 		/* Joy of joys, we must allocate another extended ptn */
 		mbri = ext;
 		ext = calloc(1, sizeof *ext);
 		if (!ext)
 			return 0;
 		mbri->extended = ext;
 		ext->prev_ext = mbri;
 		ext->mbr.mbr_parts[0].mbrp_start = bsec;
 		ext->mbr.mbr_parts[0].mbrp_size = delta - bsec;
 		ext->sector = mbri->sector + mbri->mbr.mbr_parts[0].mbrp_start
 					   + mbri->mbr.mbr_parts[0].mbrp_size;
 		mbri->mbr.mbr_parts[1].mbrp_start = ext->sector - ombri->extended->sector;
 		mbri->mbr.mbr_parts[1].mbrp_type = MBR_PTYPE_EXT;
 		mbri->mbr.mbr_parts[1].mbrp_size = delta;
 		break;
+	}
 	if (opt >= MBR_PART_COUNT && max - new <= (uint32_t)bsec)
 		/* Round up if not enough space for a header for free area */
 		new = max;
 	if (new != mbrp->mbrp_size) {
 		/* Kill information about old partition from label */
 		mbri->last_mounted[opt < MBR_PART_COUNT ? opt : 0] = NULL;
 		remove_old_partitions(mbri->sector + mbrp->mbrp_start +
 			    mbrp->mbrp_size, (int64_t)new - mbrp->mbrp_size);
+	}
 	mbrp->mbrp_size = new;
 	if (opt < MBR_PART_COUNT || new == max)
 		return 0;
 	/* Add extended partition for the free space */
 	ext = calloc(1, sizeof *ext);
 	if (!ext) {
 		mbrp->mbrp_size = max;
 		return 0;
+	}
 	/* Link into our extended chain */
 	ext->extended = mbri->extended;
 	mbri->extended = ext;
 	ext->prev_ext = mbri;
 	if (ext->extended != NULL)
 		ext->extended->prev_ext = ext;
 	ext->mbr.mbr_parts[1] = mbri->mbr.mbr_parts[1];
 	freespace = max - new;
 	if (mbri->prev_ext != NULL)
 		mbri->prev_ext->mbr.mbr_parts[1].mbrp_size -= freespace;
 	ext->mbr.mbr_parts[0].mbrp_start = bsec;
 	ext->mbr.mbr_parts[0].mbrp_size = freespace - bsec;
 	ext->sector = mbri->sector + mbri->mbr.mbr_parts[0].mbrp_start
 				   + mbri->mbr.mbr_parts[0].mbrp_size;
 	mbri->mbr.mbr_parts[1].mbrp_start = ext->sector - ombri->extended->sector;
 	mbri->mbr.mbr_parts[1].mbrp_type = MBR_PTYPE_EXT;
 	mbri->mbr.mbr_parts[1].mbrp_size = freespace;
 	return 0;
+}
 static int
 edit_mbr_active(menudesc *m, void *arg)
+{
 	mbr_info_t *mbri = arg;
 	int i;
 	uint8_t *fl;
 	if (mbri->opt >= MBR_PART_COUNT)
 		/* sanity */
 		return 0;
 	/* Invert active flag */
 	fl = &mbri->mbr.mbr_parts[mbri->opt].mbrp_flag;
 	if (*fl == MBR_PFLAG_ACTIVE) {
 		*fl = 0;
 		return 0;
+	}
 	/* Ensure there is at most one active partition */
 	for (i = 0; i < MBR_PART_COUNT; i++)
 		mbri->mbr.mbr_parts[i].mbrp_flag = 0;
 	*fl = MBR_PFLAG_ACTIVE;
 	return 0;
+}
 static int
 edit_mbr_install(menudesc *m, void *arg)
+{
 	mbr_info_t *mbri = arg;
 	mbr_info_t *ombri = arg;
 	struct mbr_partition *mbrp;
 	int opt = mbri->opt;
 	uint start;
 	mbrp = get_mbrp(&mbri, opt);
 	if (opt >= MBR_PART_COUNT)
 		opt = 0;
 	start = mbri->sector + mbrp->mbrp_start;
 	/* We just remember the start address of the partition... */
 	if (start == ombri->install)
 		ombri->install = 0;
 	else
 		ombri->install = start;
 	return 0;
+}
 #ifdef BOOTSEL
 static int
 edit_mbr_bootmenu(menudesc *m, void *arg)
+{
 	mbr_info_t *mbri = arg;
 	mbr_info_t *ombri = arg;
 	struct mbr_partition *mbrp;
 	int opt = mbri->opt;
 	mbrp = get_mbrp(&mbri, opt);
 	if (opt >= MBR_PART_COUNT)
 		opt = 0;
 	msg_prompt_win(/* XXX translate? */ "bootmenu", -1, 18, 0, 0,
 		mbri->mbrb.mbrbs_nametab[opt],
 		mbri->mbrb.mbrbs_nametab[opt],
 		sizeof mbri->mbrb.mbrbs_nametab[opt]);
 	if (mbri->mbrb.mbrbs_nametab[opt][0] == ' ')
 		mbri->mbrb.mbrbs_nametab[opt][0] = 0;
 	if (mbri->mbrb.mbrbs_nametab[opt][0] == 0
 	    && ombri->bootsec == mbri->sector + mbrp->mbrp_start)
 		ombri->bootsec = 0;
 	return 0;
+}
 static int
 edit_mbr_bootdefault(menudesc *m, void *arg)
+{
 	mbr_info_t *mbri = arg;
 	mbr_info_t *ombri = arg;
 	struct mbr_partition *mbrp;
 	mbrp = get_mbrp(&mbri, mbri->opt);
 	ombri->bootsec = mbri->sector + mbrp->mbrp_start;
 	return 0;
+}
 #endif
 static void set_ptn_label(menudesc *m, int line, void *arg);
 static void set_ptn_header(menudesc *m, void *arg);
 static int
 edit_mbr_entry(menudesc *m, void *arg)
+{
 	mbr_info_t *mbri = arg;
 	static int ptn_menu = -1;
 	static menu_ent ptn_opts[] = {
 #define PTN_OPT_TYPE		0
 		{NULL, OPT_NOMENU, 0, edit_mbr_type},
 #define PTN_OPT_START		1
 		{NULL, OPT_NOMENU, 0, edit_mbr_start},
 #define PTN_OPT_SIZE		2
 		{NULL, OPT_NOMENU, 0, edit_mbr_size},
 #define PTN_OPT_END		3
 		{NULL, OPT_NOMENU, OPT_IGNORE, NULL},	/* display end */
 #define PTN_OPT_ACTIVE		4
 		{NULL, OPT_NOMENU, 0, edit_mbr_active},
 #define PTN_OPT_INSTALL		5
 		{NULL, OPT_NOMENU, 0, edit_mbr_install},
 #ifdef BOOTSEL
 #define PTN_OPT_BOOTMENU	6
 		{NULL, OPT_NOMENU, 0, edit_mbr_bootmenu},
 #define PTN_OPT_BOOTDEFAULT	7
 		{NULL, OPT_NOMENU, 0, edit_mbr_bootdefault},
 #endif
 		{MSG_askunits, MENU_sizechoice, OPT_SUB, NULL},
 	};
 	if (ptn_menu == -1)
 		ptn_menu = new_menu(NULL, ptn_opts, nelem(ptn_opts),
 , 6, 0, 54,
 			MC_SUBMENU | MC_SCROLL | MC_NOCLEAR,
 			set_ptn_header, set_ptn_label, NULL,
 			NULL, MSG_Partition_OK);
 	if (ptn_menu == -1)
 		return 1;
 	mbri->opt = m->cursel;
 	process_menu(ptn_menu, mbri);
 	return 0;
+}
 static void
 set_ptn_label(menudesc *m, int line, void *arg)
+{
 	mbr_info_t *mbri = arg;
 	mbr_info_t *ombri = arg;
 	struct mbr_partition *mbrp;
 	int opt;
 	static const char *yes, *no;
 	if (yes == NULL) {
 		yes = msg_string(MSG_Yes);
 		no = msg_string(MSG_No);
+	}
 	opt = mbri->opt;
 	mbrp = get_mbrp(&mbri, opt);
 	if (opt >= MBR_PART_COUNT)
 		opt = 0;
 	switch (line) {
 	case PTN_OPT_TYPE:
 		wprintw(m->mw, msg_string(MSG_ptn_type),
 			get_partname(mbrp->mbrp_type));
 		break;
 	case PTN_OPT_START:
 		wprintw(m->mw, msg_string(MSG_ptn_start),
 		    (mbri->sector + mbrp->mbrp_start) / sizemult, multname);
 		break;
 	case PTN_OPT_SIZE:
 		wprintw(m->mw, msg_string(MSG_ptn_size),
 		    (mbri->sector + mbrp->mbrp_start + mbrp->mbrp_size) /
 			    sizemult -
 		    (mbri->sector + mbrp->mbrp_start) / sizemult, multname);
 		break;
 	case PTN_OPT_END:
 		wprintw(m->mw, msg_string(MSG_ptn_end),
 		    (mbri->sector + mbrp->mbrp_start + mbrp->mbrp_size) /
 			    sizemult, multname);
 		break;
 	case PTN_OPT_ACTIVE:
 		wprintw(m->mw, msg_string(MSG_ptn_active),
 		    mbrp->mbrp_flag == MBR_PFLAG_ACTIVE ? yes : no);
 		break;
 	case PTN_OPT_INSTALL:
 		wprintw(m->mw, msg_string(MSG_ptn_install),
 		    mbri->sector + mbrp->mbrp_start == ombri->install &&
 			mbrp->mbrp_type == MBR_PTYPE_NETBSD ? yes : no);
 		break;
 #ifdef BOOTSEL
 	case PTN_OPT_BOOTMENU:
 		wprintw(m->mw, msg_string(MSG_bootmenu),
 		    mbri->mbrb.mbrbs_nametab[opt]);
 		break;
 	case PTN_OPT_BOOTDEFAULT:
 		wprintw(m->mw, msg_string(MSG_boot_dflt),
 		    ombri->bootsec == mbri->sector + mbrp->mbrp_start ? yes
 								      : no);
 		break;
 #endif
+	}
+}
 static void
 set_ptn_header(menudesc *m, void *arg)
+{
 	mbr_info_t *mbri = arg;
 	struct mbr_partition *mbrp;
 	int opt = mbri->opt;
 	int typ;
 	mbrp = get_mbrp(&mbri, opt);
 	if (opt >= MBR_PART_COUNT)
 		opt = 0;
 	typ = mbrp->mbrp_type;
 #define DISABLE(opt,cond) \
 	if (cond) \
 		m->opts[opt].opt_flags |= OPT_IGNORE; \
 	else \
 		m->opts[opt].opt_flags &= ~OPT_IGNORE;
 	/* Can't change type of the extended partition unless it is empty */
 	DISABLE(PTN_OPT_TYPE, MBR_IS_EXTENDED(typ) &&
 	    (mbri->extended->mbr.mbr_parts[0].mbrp_type != 0 ||
 					    mbri->extended->extended != NULL));
 	/* It is unnecessary to be able to change the base of an extended ptn */
 	DISABLE(PTN_OPT_START, mbri->sector || typ == 0);
 	/* or the size of a free area */
 	DISABLE(PTN_OPT_SIZE, typ == 0);
 	/* Only 'normal' partitions can be 'Active' */
 	DISABLE(PTN_OPT_ACTIVE, mbri->sector != 0 || MBR_IS_EXTENDED(typ) || typ == 0);
 	/* Can only install into NetBSD partition */
 	DISABLE(PTN_OPT_INSTALL, typ != MBR_PTYPE_NETBSD);
 #ifdef BOOTSEL
 	/* The extended partition isn't bootable */
 	DISABLE(PTN_OPT_BOOTMENU, MBR_IS_EXTENDED(typ) || typ == 0);
 	if (typ == 0)
 		mbri->mbrb.mbrbs_nametab[opt][0] = 0;
 	/* Only partitions with bootmenu names can be made the default */
 	DISABLE(PTN_OPT_BOOTDEFAULT, mbri->mbrb.mbrbs_nametab[opt][0] == 0);
 #endif
 #undef DISABLE
+}
 static void
 set_mbr_label(menudesc *m, int opt, void *arg)
+{
 	mbr_info_t *mbri = arg;
 	mbr_info_t *ombri = arg;
 	struct mbr_partition *mbrp;
 	uint rstart, rend;
 	const char *name, *cp, *mounted;
 	int len;
 	mbrp = get_mbrp(&mbri, opt);
 	if (opt >= MBR_PART_COUNT)
 		opt = 0;
 	if (mbrp->mbrp_type == 0 && mbri->sector == 0) {
 		len = snprintf(0, 0, msg_string(MSG_part_row_used), 0, 0, 0);
 		wprintw(m->mw, "%*s", len, "");
 	} else {
 		rstart = mbri->sector + mbrp->mbrp_start;
 		rend = (rstart + mbrp->mbrp_size) / sizemult;
 		rstart = rstart / sizemult;
 		wprintw(m->mw, msg_string(MSG_part_row_used),
 		    rstart, rend - rstart,
 		    mbrp->mbrp_flag == MBR_PFLAG_ACTIVE ? 'a' : ' ',
 #ifdef BOOTSEL
 		    ombri->bootsec == mbri->sector + mbrp->mbrp_start ? 'd' :
 #endif
 			' ',
 		    mbri->sector + mbrp->mbrp_start == ombri->install &&
 			mbrp->mbrp_type == MBR_PTYPE_NETBSD ? 'I' : ' ');
+	}
 	name = get_partname(mbrp->mbrp_type);
 	mounted = mbri->last_mounted[opt];
 	len = strlen(name);
 	cp = strchr(name, ',');
 	if (cp != NULL)
 		len = cp - name;
 	if (mounted && *mounted != 0) {
 		wprintw(m->mw, " %*s (%s)", len, name, mounted);
 	} else
 		wprintw(m->mw, " %.*s", len, name);
 #ifdef BOOTSEL
 	if (mbri->mbrb.mbrbs_nametab[opt][0] != 0) {
 		int x, y;
 		getyx(m->mw, y, x);
 		if (x > 52) {
 			x = 52;
 			wmove(m->mw, y, x);
+		}
 		wprintw(m->mw, "%*s %s", 53 - x, "",
 		    mbri->mbrb.mbrbs_nametab[opt]);
+	}
 #endif
+}
 static void
 set_mbr_header(menudesc *m, void *arg)
+{
 	mbr_info_t *mbri = arg;
 	static menu_ent *opts;
 	static int num_opts;
 	mbr_info_t *ext;
 	menu_ent *op;
 	int i;
 	int left;
 	msg_display(MSG_editparttable);
 	msg_table_add(MSG_part_header, (unsigned long)(pm->dlsize/sizemult),
 	    multname, multname, multname, multname);
 	if (num_opts == 0) {
 		num_opts = 6;
 		opts = malloc(6 * sizeof *opts);
 		if (opts == NULL) {
 			m->numopts = 0;
 			return;
+		}
+	}
 	/* First four items are the main partitions */
 	for (op = opts, i = 0; i < MBR_PART_COUNT; op++, i++) {
 		op->opt_name = NULL;
 		op->opt_menu = OPT_NOMENU;
 		op->opt_flags = OPT_SUB;
 		op->opt_action = edit_mbr_entry;
+	}
 	left = num_opts - MBR_PART_COUNT;
 	/* Followed by the extended partitions */
 	for (ext = mbri->extended; ext; left--, op++, ext = ext->extended) {
 		if (left <= 1) {
 			menu_ent *new = realloc(opts,
 						(num_opts + 4) * sizeof *opts);
 			if (new == NULL)
 				break;
 			num_opts += 4;
 			left += 4;
 			op = new + (op - opts);
 			opts = new;
+		}
 		op->opt_name = NULL;
 		op->opt_menu = OPT_NOMENU;
 		op->opt_flags = 0;
 		op->opt_action = edit_mbr_entry;
+	}
 	/* and unit changer */
 	op->opt_name = MSG_askunits;
 	op->opt_menu = MENU_sizechoice;
 	op->opt_flags = OPT_SUB;
 	op->opt_action = NULL;
 	op++;
 	m->opts = opts;
 	m->numopts = op - opts;
+}
 int
 mbr_use_wholedisk(mbr_info_t *mbri)
+{
 	struct mbr_sector *mbrs = &mbri->mbr;
 	mbr_info_t *ext;
 	struct mbr_partition *part;
 	part = &mbrs->mbr_parts[0];
 	/* Set the partition information for full disk usage. */
 	while ((ext = mbri->extended)) {
 		mbri->extended = ext->extended;
 		free(ext);
+	}
 	memset(part, 0, MBR_PART_COUNT * sizeof *part);
 #ifdef BOOTSEL
 	memset(&mbri->mbrb, 0, sizeof mbri->mbrb);
 #endif
 	part[0].mbrp_type = MBR_PTYPE_NETBSD;
 	part[0].mbrp_size = pm->dlsize - ptn_0_offset;
 	part[0].mbrp_start = ptn_0_offset;
 	part[0].mbrp_flag = MBR_PFLAG_ACTIVE;
 	pm->ptstart = ptn_0_offset;
 	pm->ptsize = pm->dlsize - ptn_0_offset;
 	return 1;
+}
 /*
  * Let user change incore Master Boot Record partitions via menu.
  */
 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;
 		for (i = 0; i < MBR_PART_COUNT; i++) {
 			j = part[i].mbrp_type;
 			if (j == 0)
 				continue;
 			numbsd++;
 			if (j != MBR_PTYPE_NETBSD)
 				numbsd++;
+		}
 		/* Ask if we really want to blow away non-NetBSD stuff */
 		if (numbsd > 1) {
 			msg_display(MSG_ovrwrite);
 			if (!ask_noyes(NULL)) {
 				if (logfp)
 					(void)fprintf(logfp, "User answered no to destroy other data, aborting.\n");
 				return 0;
+			}
+		}
 		return(md_mbr_use_wholedisk(mbri));
+	}
 	mbr_menu = new_menu(NULL, NULL, 16, 0, -1, 15, 70,
 			MC_NOBOX | MC_ALWAYS_SCROLL | MC_NOCLEAR,
 			set_mbr_header, set_mbr_label, NULL,
 			NULL, MSG_Partition_table_ok);
 	if (mbr_menu == -1)
 		return 0;
 	/* Default to MB, and use bios geometry for cylinder size */
 	set_sizemultname_meg();
 	pm->current_cylsize = bhead * bsec;
 	for (;;) {
 		pm->ptstart = 0;
 		pm->ptsize = 0;
 		process_menu(mbr_menu, mbri);
 		activepart = 0;
 		bsdstart = 0;
 		bsdsize = 0;
 		for (ext = mbri; ext; ext = ext->extended) {
 			part = ext->mbr.mbr_parts;
 			for (i = 0; i < MBR_PART_COUNT; part++, i++) {
 				if (part->mbrp_flag != 0)
 					activepart = 1;
 				if (part->mbrp_type != MBR_PTYPE_NETBSD)
 					continue;
 				start = ext->sector + part->mbrp_start;
 				if (start == mbri->install) {
 					pm->ptstart = mbri->install;
 					pm->ptsize = part->mbrp_size;
+				}
 				if (bsdstart != 0)
 					bsdstart = ~0;
 				else {
 					bsdstart = start;
 					bsdsize = part->mbrp_size;
+				}
+			}
+		}
 		/* Install in only netbsd partition if none tagged */
 		if (pm->ptstart == 0 && bsdstart != ~0u) {
 			pm->ptstart = bsdstart;
 			pm->ptsize = bsdsize;
+		}
 		if (pm->ptstart == 0) {
 			if (bsdstart == 0)
 				msg_display(MSG_nobsdpart);
 			else
 				msg_display(MSG_multbsdpart, 0);
 			msg_display_add(MSG_reeditpart, 0);
 			if (!ask_yesno(NULL))
 				return 0;
 			continue;
+		}
 		if (activepart == 0) {
 			msg_display(MSG_noactivepart);
 			if (ask_yesno(NULL))
 				continue;
+		}
 		/* the md_check_mbr function has 3 ret codes to deal with
 		 * the different possible states. 0, 1, >1
 		 */
 		j = md_check_mbr(mbri);
 		if (j == 0)
 			return 0;
 		if (j == 1)
 			continue;
 		break;
+	}
 	free_menu(mbr_menu);
 	return 1;
+}
 const char *
 get_partname(int typ)
+{
 	int j;
 	static char unknown[32];
 	for (j = 0; part_ids[j].id != -1; j++)
 		if (part_ids[j].id == typ)
 			return part_ids[j].name;
 	snprintf(unknown, sizeof unknown, "Unknown (%d)", typ);
 	return unknown;
+}
 #ifdef BOOTSEL
 static int
 validate_and_set_names(mbr_info_t *mbri, const struct mbr_bootsel *src,
     uint32_t ext_base)
+{
 	size_t i, l;
 	const unsigned char *p;
 	/*
 	 * The 16 bit magic used to detect whether mbr_bootsel is valid
 	 * or not is pretty week - collisions have been seen in the wild;
 	 * but maybe it is just foreign tools corruption reminiscents
 	 * of NetBSD MBRs. Anyway, before accepting a boot menu definition,
 	 * make sure it is kinda "sane".
 	 */
 	for (i = 0; i < MBR_PART_COUNT; i++) {
 		/*
 		 * Make sure the name does not contain controll chars
 		 * (not using iscntrl due to minimalistic locale support
 		 * in miniroot environments) and is properly 0-terminated.
 		 */
 		for (l = 0, p = (const unsigned char *)&src->mbrbs_nametab[i];
 		    *p != 0; l++, p++) {
 			if (l >	MBR_BS_PARTNAMESIZE)
 				return 0;
 			if (*p < ' ')	/* hacky 'iscntrl' */
 				return 0;
+		}
+	}
 	memcpy(&mbri->mbrb, src, sizeof(*src));
 	if (ext_base == 0)
 		return mbri->mbrb.mbrbs_defkey - SCAN_1;
 	return 0;
+}
 #endif
 int
 read_mbr(const char *disk, mbr_info_t *mbri)
+{
 	struct mbr_partition *mbrp;
 	struct mbr_sector *mbrs = &mbri->mbr;
 	mbr_info_t *ext = NULL;
 	char diskpath[MAXPATHLEN];
 	int fd, i;
 	uint32_t ext_base = 0, next_ext = 0, ext_size = 0;
 	int rval = -1;
 #ifdef BOOTSEL
 	mbr_info_t *ombri = mbri;
 	int bootkey = 0;
 #endif
 	/*
 	 * Fake up a likely 'bios sectors per track' for any extended
 	 * partition headers we might have to produce.
 	 */
 	if (bsec == 0)
 		bsec = pm->dlsec;
 	if (bhead == 0)
 		bhead = pm->dlhead;
 	if (bcyl == 0)
 		bhead = pm->dlcyl;
 	ptn_0_offset = bsec;
 	/* use 1MB default offset on large disks as fdisk(8) */
 	if (pm->dlsize > 2048 * 1024 * 128)
 		ptn_0_offset = 2048;
 	memset(mbri, 0, sizeof *mbri);
 	/* Open the disk. */
 	fd = opendisk(disk, O_RDONLY, diskpath, sizeof(diskpath), 0);
 	if (fd < 0)
 		goto bad_mbr;
 	for (;;) {
 		if (pread(fd, mbrs, sizeof *mbrs,
 		    (ext_base + next_ext) * (off_t)MBR_SECSIZE) - sizeof *mbrs != 0)
 			break;
 		if (!valid_mbr(mbrs))
 			break;
 		mbrp = &mbrs->mbr_parts[0];
 		if (ext_base == 0) {
 			get_ptn_alignment(mbrp);	/* get ptn_0_offset */
 		} else {
 			/* sanity check extended chain */
 			if (MBR_IS_EXTENDED(mbrp[0].mbrp_type))
 				break;
 			if (mbrp[1].mbrp_type != 0 &&
 			    !MBR_IS_EXTENDED(mbrp[1].mbrp_type))
 				break;
 			if (mbrp[2].mbrp_type != 0 || mbrp[3].mbrp_type != 0)
 				break;
 			/* Looks ok, link into extended chain */
 			mbri->extended = ext;
 			ext->prev_ext = next_ext != 0 ? mbri : NULL;
 			ext->extended = NULL;
 			mbri = ext;
 			ext = NULL;
+		}
 #if BOOTSEL
 		if (mbrs->mbr_bootsel_magic == htole16(MBR_MAGIC)) {
 			/* old bootsel, grab bootsel info */
 			bootkey = validate_and_set_names(mbri,
 				(struct mbr_bootsel *)
 				((uint8_t *)mbrs + MBR_BS_OLD_OFFSET),
 				ext_base);
 		} else if (mbrs->mbr_bootsel_magic == htole16(MBR_BS_MAGIC)) {
 			/* new location */
 			bootkey = validate_and_set_names(mbri,
 			    &mbrs->mbr_bootsel, ext_base);
+		}
 		/* Save original flags for mbr code update tests */
 		mbri->oflags = mbri->mbrb.mbrbs_flags;
 #endif
 		mbri->sector = next_ext + ext_base;
 		next_ext = 0;
 		rval = 0;
 		for (i = 0; i < MBR_PART_COUNT; mbrp++, i++) {
 			if (mbrp->mbrp_type == 0) {
 				/* type is unused, discard scum */
 				memset(mbrp, 0, sizeof *mbrp);
 				continue;
+			}
 			mbrp->mbrp_start = le32toh(mbrp->mbrp_start);
 			mbrp->mbrp_size = le32toh(mbrp->mbrp_size);
 			if (MBR_IS_EXTENDED(mbrp->mbrp_type)) {
 				next_ext = mbrp->mbrp_start;
 				if (ext_base == 0)
 					ext_size = mbrp->mbrp_size;
 			} else {
 				mbri->last_mounted[i] = strdup(get_last_mounted(
 					fd, mbri->sector + mbrp->mbrp_start, NULL));
 #if BOOTSEL
 				if (ombri->install == 0 &&
 				    strcmp(mbri->last_mounted[i], "/") == 0)
 					ombri->install = mbri->sector +
 							mbrp->mbrp_start;
 #endif
+			}
 #if BOOTSEL
 			if (mbri->mbrb.mbrbs_nametab[i][0] != 0
 			    && bootkey-- == 0)
 				ombri->bootsec = mbri->sector +
 							mbrp->mbrp_start;
 #endif
+		}
 		if (ext_base != 0) {
 			/* Is there a gap before the next partition? */
 			unsigned int limit = next_ext;
 			unsigned int base;
 			if (limit == 0)
 				limit = ext_size;
 			mbrp -= MBR_PART_COUNT;
 			base =mbri->sector + mbrp->mbrp_start + mbrp->mbrp_size;
 			if (mbrp->mbrp_type != 0 && ext_base + limit != base) {
 				/* Mock up an extry for the space */
 				ext = calloc(1, sizeof *ext);
 				if (!ext)
 					break;
 				ext->sector = base;
 				ext->mbr.mbr_magic = htole16(MBR_MAGIC);
 				ext->mbr.mbr_parts[1] = mbrp[1];
 				ext->mbr.mbr_parts[0].mbrp_start = ptn_0_offset;
 				ext->mbr.mbr_parts[0].mbrp_size =
 				    ext_base + limit - base - ptn_0_offset;
 				mbrp[1].mbrp_type = MBR_PTYPE_EXT;
 				mbrp[1].mbrp_start = base - ext_base;
 				mbrp[1].mbrp_size = limit - mbrp[1].mbrp_start;
 				mbri->extended = ext;
 				ext->prev_ext = mbri;
 				ext->extended = NULL;
 				mbri = ext;
 				ext = NULL;
+			}
+		}
 		if (next_ext == 0 || ext_base + next_ext <= mbri->sector)
 			break;
 		if (ext_base == 0) {
 			ext_base = next_ext;
 			next_ext = 0;
+		}
 		ext = calloc(sizeof *ext, 1);
 		if (!ext)
 			break;
 		mbrs = &ext->mbr;
+	}
     bad_mbr:
 	free(ext);
 	if (fd >= 0)
 		close(fd);
 	if (rval == -1) {
 		memset(&mbrs->mbr_parts, 0, sizeof mbrs->mbr_parts);
 		mbrs->mbr_magic = htole16(MBR_MAGIC);
+	}
 	dump_mbr(ombri, "read");
 	return rval;
+}
 int
 write_mbr(const char *disk, mbr_info_t *mbri, int convert)
+{
 	char diskpath[MAXPATHLEN];
 	int fd, i, ret = 0;
 	struct mbr_partition *mbrp;
 	u_int32_t pstart, psize;
 #ifdef BOOTSEL
 	struct mbr_sector *mbrs;
 #endif
 	struct mbr_sector mbrsec;
 	mbr_info_t *ext;
 	uint sector;
 	/* Open the disk. */
 	fd = opendisk(disk, O_WRONLY, diskpath, sizeof(diskpath), 0);
 	if (fd < 0)
 		return -1;
 #ifdef BOOTSEL
 	/*
 	 * If the main boot code (appears to) contain the netbsd bootcode,
 	 * copy in all the menu strings and set the default keycode
 	 * to be that for the default partition.
 	 * Unfortunately we can't rely on the user having actually updated
 	 * to the new mbr code :-(
 	 */
 	if (mbri->mbr.mbr_bootsel_magic == htole16(MBR_BS_MAGIC)
 	    || mbri->mbr.mbr_bootsel_magic == htole16(MBR_MAGIC)) {
 		int8_t key = SCAN_1;
 		uint offset = MBR_BS_OFFSET;
 		if (mbri->mbr.mbr_bootsel_magic == htole16(MBR_MAGIC))
 			offset = MBR_BS_OLD_OFFSET;
 		mbri->mbrb.mbrbs_defkey = SCAN_ENTER;
 		if (mbri->mbrb.mbrbs_timeo == 0)
 			mbri->mbrb.mbrbs_timeo = 182;	/* 10 seconds */
 		for (ext = mbri; ext != NULL; ext = ext->extended) {
 			mbrs = &ext->mbr;
 			mbrp = &mbrs->mbr_parts[0];
 			/* Ensure marker is set in each sector */
 			mbrs->mbr_bootsel_magic = mbri->mbr.mbr_bootsel_magic;
 			/* and copy in bootsel parameters */
 			*(struct mbr_bootsel *)((uint8_t *)mbrs + offset) =
 								    ext->mbrb;
 			for (i = 0; i < MBR_PART_COUNT; i++) {
 				if (ext->mbrb.mbrbs_nametab[i][0] == 0)
 					continue;
 				if (ext->sector + mbrp->mbrp_start ==
 								mbri->bootsec)
 					mbri->mbrb.mbrbs_defkey = key;
 				key++;
+			}
+		}
 		/* copy main data (again) since we've put the 'key' in */
 		*(struct mbr_bootsel *)((uint8_t *)&mbri->mbr + offset) =
 								    mbri->mbrb;
+	}
 #endif
 	for (ext = mbri; ext != NULL; ext = ext->extended) {
 		sector = ext->sector;
 		mbrsec = ext->mbr;	/* copy sector */
 		mbrp = &mbrsec.mbr_parts[0];
 		if (sector != 0 && ext->extended != NULL
 		    && ext->extended->mbr.mbr_parts[0].mbrp_type == 0) {
 			/* We are followed by an empty slot, collapse out */
 			ext = ext->extended;
 			/* Make us describe the next non-empty partition */
 			mbrp[1] = ext->mbr.mbr_parts[1];
+		}
 		for (i = 0; i < MBR_PART_COUNT; i++) {
 			if (mbrp[i].mbrp_start == 0 && mbrp[i].mbrp_size == 0) {
 				mbrp[i].mbrp_scyl = 0;
 				mbrp[i].mbrp_shd = 0;
 				mbrp[i].mbrp_ssect = 0;
 				mbrp[i].mbrp_ecyl = 0;
 				mbrp[i].mbrp_ehd = 0;
 				mbrp[i].mbrp_esect = 0;
 				continue;
+			}
 			pstart = mbrp[i].mbrp_start;
 			psize = mbrp[i].mbrp_size;
 			mbrp[i].mbrp_start = htole32(pstart);
 			mbrp[i].mbrp_size = htole32(psize);
 			if (convert) {
 				convert_mbr_chs(bcyl, bhead, bsec,
 				    &mbrp[i].mbrp_scyl, &mbrp[i].mbrp_shd,
 				    &mbrp[i].mbrp_ssect, pstart);
 				convert_mbr_chs(bcyl, bhead, bsec,
 				    &mbrp[i].mbrp_ecyl, &mbrp[i].mbrp_ehd,
 				    &mbrp[i].mbrp_esect, pstart + psize - 1);
+			}
+		}
 		mbrsec.mbr_magic = htole16(MBR_MAGIC);
 		if (pwrite(fd, &mbrsec, sizeof mbrsec,
 					    sector * (off_t)MBR_SECSIZE) < 0) {
 			ret = -1;
 			break;
+		}
+	}
 	(void)close(fd);
 	return ret;
+}
 int
 valid_mbr(struct mbr_sector *mbrs)
+{
 	return (le16toh(mbrs->mbr_magic) == MBR_MAGIC);
+}
 static void
 convert_mbr_chs(int cyl, int head, int sec,
 		uint8_t *cylp, uint8_t *headp, uint8_t *secp,
 		uint32_t relsecs)
+{
 	unsigned int tcyl, temp, thead, tsec;
 	temp = head * sec;
 	tcyl = relsecs / temp;
 	relsecs -= tcyl * temp;
 	thead = relsecs / sec;
 	tsec = relsecs - thead * sec + 1;
 	if (tcyl > MAXCYL)
 		tcyl = MAXCYL;
 	*cylp = MBR_PUT_LSCYL(tcyl);
 	*headp = thead;
 	*secp = MBR_PUT_MSCYLANDSEC(tcyl, tsec);
+}
 /*
  * This function is ONLY to be used as a last resort to provide a
  * hint for the user. Ports should provide a more reliable way
  * of getting the BIOS geometry. The i386 code, for example,
  * uses the BIOS geometry as passed on from the bootblocks,
  * and only uses this as a hint to the user when that information
  * is not present, or a match could not be made with a NetBSD
  * device.
  */
 int
 guess_biosgeom_from_mbr(mbr_info_t *mbri, int *cyl, int *head, daddr_t *sec)
+{
 	struct mbr_sector *mbrs = &mbri->mbr;
 	struct mbr_partition *parts = &mbrs->mbr_parts[0];
 	int xcylinders, xheads, i, j;
 	daddr_t xsectors;
 	int c1, h1, s1, c2, h2, s2;
 	daddr_t a1, a2;
 	uint64_t num, denom;
 	/*
 	 * The physical parameters may be invalid as bios geometry.
 	 * If we cannot determine the actual bios geometry, we are
 	 * better off picking a likely 'faked' geometry than leaving
 	 * the invalid physical one.
 	 */
 	xcylinders = pm->dlcyl;
 	xheads = pm->dlhead;
 	xsectors = pm->dlsec;
 	if (xcylinders > MAXCYL || xheads > MAXHEAD || xsectors > MAXSECTOR) {
 		xsectors = MAXSECTOR;
 		xheads = MAXHEAD;
 		xcylinders = pm->dlsize / (MAXSECTOR * MAXHEAD);
 		if (xcylinders > MAXCYL)
 			xcylinders = MAXCYL;
+	}
 	*cyl = xcylinders;
 	*head = xheads;
 	*sec = xsectors;
 	xheads = -1;
 	/* Try to deduce the number of heads from two different mappings. */
 	for (i = 0; i < MBR_PART_COUNT * 2 - 1; i++) {
 		if (get_mapping(parts, i, &c1, &h1, &s1, &a1) < 0)
 			continue;
 		a1 -= s1;
 		for (j = i + 1; j < MBR_PART_COUNT * 2; j++) {
 			if (get_mapping(parts, j, &c2, &h2, &s2, &a2) < 0)
 				continue;
 			a2 -= s2;
 			num = (uint64_t)h1 * a2 - (quad_t)h2 * a1;
 			denom = (uint64_t)c2 * a1 - (quad_t)c1 * a2;
 			if (num != 0 && denom != 0 && num % denom == 0) {
 				xheads = (int)(num / denom);
 				xsectors = a1 / (c1 * xheads + h1);
 				break;
+			}
+		}
 		if (xheads != -1)
 			break;
+	}
 	if (xheads == -1)
 		return -1;
 	/*
 	 * Estimate the number of cylinders.
 	 * XXX relies on get_disks having been called.
 	 */
 	xcylinders = pm->dlsize / xheads / xsectors;
 	if (pm->dlsize != xcylinders * xheads * xsectors)
 		xcylinders++;
 	/*
 	 * Now verify consistency with each of the partition table entries.
 	 * Be willing to shove cylinders up a little bit to make things work,
 	 * but translation mismatches are fatal.
 	 */
 	for (i = 0; i < MBR_PART_COUNT * 2; i++) {
 		if (get_mapping(parts, i, &c1, &h1, &s1, &a1) < 0)
 			continue;
 		if (c1 >= MAXCYL - 1)
 			/* Ignore anything that is near the CHS limit */
 			continue;
 		if (xsectors * (c1 * xheads + h1) + s1 != a1)
 			return -1;
+	}
 	/*
 	 * Everything checks out.  Reset the geometry to use for further
 	 * calculations.
 	 */
 	*cyl = MIN(xcylinders, MAXCYL);
 	*head = xheads;
 	*sec = xsectors;
 	return 0;
+}
 static int
 get_mapping(struct mbr_partition *parts, int i,
 	    int *cylinder, int *head, int *sector, daddr_t *absolute)
+{
 	struct mbr_partition *apart = &parts[i / 2];
 	if (apart->mbrp_type == 0)
 		return -1;
 	if (i % 2 == 0) {
 		*cylinder = MBR_PCYL(apart->mbrp_scyl, apart->mbrp_ssect);
 		*head = apart->mbrp_shd;
 		*sector = MBR_PSECT(apart->mbrp_ssect) - 1;
 		*absolute = le32toh(apart->mbrp_start);
 	} else {
 		*cylinder = MBR_PCYL(apart->mbrp_ecyl, apart->mbrp_esect);
 		*head = apart->mbrp_ehd;
 		*sector = MBR_PSECT(apart->mbrp_esect) - 1;
 		*absolute = le32toh(apart->mbrp_start)
 			+ le32toh(apart->mbrp_size) - 1;
+	}
 	/* Sanity check the data against max values */
 	if ((((*cylinder * MAXHEAD) + *head) * (uint32_t)MAXSECTOR + *sector) < *absolute)
 		/* cannot be a CHS mapping */
 		return -1;
 	return 0;
+}
 /*
  * Determine partition boundary alignment as fdisk(8) does.
  */
 static void
 get_ptn_alignment(struct mbr_partition *mbrp0)
+{
 	uint32_t ptn_0_base, ptn_0_limit;
 	/* Default to using 'traditional' cylinder alignment */
 	ptn_alignment = bhead * bsec;
 	ptn_0_offset = bsec;
 	if (mbrp0->mbrp_type != 0) {
 		/* Try to copy offset of first partition */
 		ptn_0_base = le32toh(mbrp0->mbrp_start);
 		ptn_0_limit = ptn_0_base + le32toh(mbrp0->mbrp_size);
 		if (!(ptn_0_limit & 2047)) {
 			/* Partition ends on a 1MB boundary, align to 1MB */
 			ptn_alignment = 2048;
 			if (ptn_0_base <= 2048
 			    && !(ptn_0_base & (ptn_0_base - 1))) {
 				/* ptn_base is a power of 2, use it */
 				ptn_0_offset = ptn_0_base;
+			}
+		}
 	} else {
 		/* Use 1MB offset for large (>128GB) disks */
 		if (pm->dlsize > 2048 * 1024 * 128) {
 			ptn_alignment = 2048;
 			ptn_0_offset = 2048;
+		}
+	}
+}

 @@ -1,1263 +1,1274 @@
-/*	$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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of Piermont Information Systems Inc. may not be used to endorse
  *    or promote products derived from this software without specific prior
  *    written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``AS IS''
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PIERMONT INFORMATION SYSTEMS INC. BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 /* MI Message catalog -- German, machine independent */
 message usage
 {Aufruf: sysinst [-D] [-f Definitionsdatei] [-r Version] [-C bg:fg]
+}
 /*
  * We can not use non ascii characters in this message - it is displayed
  * before the locale is set up!
  */
 message sysinst_message_language
 {Installation auf Deutsch}
 message sysinst_message_locale
 {de_DE.ISO8859-15}
 message Yes {Ja}
 message No {Nein}
 message All {Alle(s)}
 message Some {Einige}
 message None {Kein(e)}
 message none {kein(e)}
 message OK {OK}
 message ok {ok}
 message On {An}
 message Off {Aus}
 message unchanged {unver�ndert}
 message Delete {L�schen?}
 message install
 {installieren}
 message reinstall
 {Sets erneut installieren f�r}
 message upgrade
 {Aktualisierung}
 message hello
 {Willkommen bei Sysinst, dem Installationsprogramm von NetBSD-@@VERSION@@.
 Dieses Programm wird Ihnen helfen, NetBSD auf eine Festplatte zu installieren
 oder aber eine bereits bestehende Installation von NetBSD zu aktualisieren.
 In den folgenden Men�s k�nnen Sie mit den Buchstaben (a, b, c, ...)
 die verschiedenen Men�eintr�ge w�hlen oder durch Dr�cken von Strg-N/Strg-P
 die Markierung auf- oder abbewegen. Die Cursor- und Bildlauftasten
 (Seite vor/zur�ck) sollten ebenfalls funktionieren.
 Durch Bet�tigen der Eingabetaste aktivieren Sie die gegenw�rtige Auswahl.
+}
 message thanks
 {Danke, dass Sie NetBSD benutzen!
+}
 message installusure
 {Sie haben sich dazu entschieden NetBSD auf Ihre Festplatte zu installieren.
 Dieser Vorgang ver�ndert Informationen auf Ihrer Festplatte. Zu diesem
 Zeitpunkt sollten Sie sicherheitshalber eine vollst�ndige Datensicherung
 gemacht haben! Die Installation durchl�uft die folgenden Schritte:
 	a) Partitionieren Ihrer Festplatte
 	b) Erstellen eines neuen BSD Dateisystems
 	c) Laden und Installieren der Distribution (Kernel+Basissystem)
 	d) Grundlegendes Konfigurieren des Systems
 (Nachdem Sie Angaben zur Partitionierung Ihrer Festplatte gemacht haben -
 aber noch bevor die Festplatte ver�ndert wird - erhalten Sie die M�glichkeit
 die Installation abzubrechen.)
 Wollen Sie fortfahren?
+}
 message upgradeusure
 {Sie m�chten das auf der Festplatte befindliche NetBSD-System aktualisieren.
 Zu diesem Zeitpunkt sollten Sie bereits eine vollst�ndige
 Datensicherung durchgef�hrt haben! Wollen Sie NetBSD wirklich aktualisieren?
 (Dies ist die letzte Warnung, bevor Ihre Festplatte(n) modifiziert werden.)
+}
 message reinstallusure
 {Im folgenden werden die NetBSD Distributionssets (Kernel + Basissystem)
 auf eine vorbereitete Festplatte ausgepackt. Diese Prozedur l�dt und entpackt
 die Sets auf eine im Vorfeld partitionierte und bootf�hige Festplatte aus.
 Es werden weder Festplatten gelabelt, Bootbl�cke aktualisiert noch bestehende
 Konfigurationen gesichert.
 Beenden Sie jetzt und w�hlen Sie dann 'Installation' oder 'Aktualisierung',
 falls Ihre Festplatte nicht entsprechend vorbereitet ist oder Sie das System
 neu installieren oder aber ein bestehendes aktualisieren m�chten!
 Wollen Sie die NetBSD Distributionssets wirklich erneut installieren?
 (Dies ist die letzte Warnung, bevor die Inhalte Ihres Dateisystems
 �berschrieben werden!)
+}
 message mount_failed
 {Versuch, %s zu mounten ist fehlgeschlagen. Fortfahren?
+}
 message nodisk
 {Ich kann keine f�r NetBSD nutzbaren Festplatten finden.
 Zur�ck zum Hauptmen�...
+}
 message onedisk
 {Ich habe nur eine Festplatte, %s, gefunden. Ich gehe somit davon aus, dass
 Sie NetBSD darauf %s m�chten.
+}
 message ask_disk
 {Auf welcher Festplatte m�chten Sie NetBSD %s? }
 message Available_disks
 {Verf�gbare Festplatten}
 message heads
 {K�pfe}
 message sectors
 {Sektoren}
 message fs_isize
 {Durchschnittliche Dateigr��e (in Bytes)}
 message mountpoint
 {Mountpoint (oder 'kein(e)'))}
 message cylname
 {Zyl}
 message secname
 {Sek}
 message megname
 {MB}
 message layout
 {NetBSD benutzt ein BSD-Disklabel, um den NetBSD-Teil der Festplatte in
 mehrere BSD Partitionen zu unterteilen. Sie m�ssen jetzt das BSD-Disklabel
 erstellen.
 Sie k�nnen einen Texteditor verwenden, um die Gr��e der NetBSD-
 Partitionen zu definieren oder aber die bestehenden Partitionen mit Gr��e
 und Inhalt belassen.
 Sie haben gleich die M�glichkeit, alle Felder des Disklabels zu ver�ndern.
 Der NetBSD-Teil Ihrer Festplatte ist %d Megabytes gro�.
 Eine volle Installation ben�tigt mindestens %d Megabytes - ohne X11 (grafische
 Oberfl�che) - und %d Megabytes, wenn Sie X11 ebenfalls installieren.
+}
 message Choose_your_size_specifier
 {W�hlen Sie Megabytes, so werden effektive Partitionsgr��en
 festgesetzt, die nahe Ihrer Gr��enangabe liegen - ausgerichtet
 nach Zylindergrenzen. Bei modernen ZBR Festplatten variieren die
 Zylindergr��en durchgehend, so da� kein gro�er Verlass auf die
 genauen Grenzen der Zylinder besteht. Bei �lteren Festplatten dagegen
 ist es am effizientesten, sich Partitionsgr��en auszusuchen, die exakt
 ein Vielfaches der aktuellen Zylindergr��e ausmachen.
 W�hlen Sie Ihre Einheit.}
 message ptnsizes
 {Sie k�nnen jetzt die Gr��en der Systempartitionen ver�ndern. Standardm��ig
 wird der gesamte Speicherplatz der Rootpartition zugeordnet. Wenn Sie
 wollen, k�nnen Sie separate Partitionen definieren, z.B. /usr (zus�tzliche
 Systemdateien), /var (Log- bzw. Protokolldateien und anderes) oder /home
 (Verzeichnis f�r die pers�nlichen Dateien der Anwender).
 Verbleibender freier Speicherplatz wird der mit '+' markierten Partition
 hinzugef�gt.
+}
 message ptnheaders
+{
        MB          Zylinder  Sektoren   Dateisystem
+}
 message askfsmount
 {Mount-Verzeichnis?}
 message askfssize
 {Gr��e f�r %s in %s?}
 message askunits
 {Ver�ndern der Gr��eneinheiten (Sektoren/Zylinder/MB)}
 message NetBSD_partition_cant_change
 {NetBSD-Partition}
 message Whole_disk_cant_change
 {Ganze Festplatte}
 message Boot_partition_cant_change
 {Boot-Partition}
 message add_another_ptn
 {Hinzuf�gen einer benutzerdefinierten Partition}
 message fssizesok
 {Akzeptieren. Freier Speicherplatz: %d %s, %d freie Partitionen.}
 message fssizesbad
 {Reduzieren der Partitionsgr��en um %d %s (%u Sektoren).}
 message startoutsidedisk
 {Der Startwert, den Sie angegeben haben, liegt jenseits des Endes der
 Festplatte.
+}
 message endoutsidedisk
 {Mit diesem Wert liegt das Ende der Partition jenseits des Endes der
 Festplatte.
 Die Gr��e Ihrer Partition wurde auf %d %s verringert.
 Dr�cken Sie die Eingabetaste um fortzufahren.
+}
 message toobigdisklabel
+{
 Diese Platte ist zu gro� f�r eine
 disklabel-Partitionstabelle und kann deswegen weder f�r
 boot- noch f�r root-Partitionen benutzt werden}
 message fspart
 {Nachfolgend sehen Sie Ihre BSD-Disklabel-Partitionen:
 (Dies ist die letzte Chance, diese zu �ndern.)
+}
 message fspart_header
 {   Start %3s Ende  %3s Gr��e  %3s FS Typ     Newfs Mount Mount Verz.
    --------- --------- ---------- ---------- ----- ----- -----------
+}
 message fspart_row
 {%9lu %9lu %10lu %-10s %-5s %-5s %s}
 message show_all_unused_partitions
 {Alle unbenutzten Partitionen anzeigen}
 message partition_sizes_ok
 {Partitionsgr��en OK}
 message edfspart
 {Die gegenw�rtigen Werte f�r die Partition '%c' werden unten angezeigt.
 W�hlen Sie das Feld, das Sie �ndern m�chten:
                           MB  Zylinder  Sektoren
 	             ------- --------- ---------
+}
 message fstype_fmt
 {Dateisystemtyp: %9s}
 message start_fmt
 {         Start: %9u %8u%c %9u}
 message size_fmt
 {        Gr��e: %9u %8u%c %9u}
 message end_fmt
 {          Ende: %9u %8u%c %9u}
 message bsize_fmt
 {   Blockgr��e: %9d bytes}
 message fsize_fmt
 {Fragmentgr��e: %9d bytes}
 message isize_fmt
 { Durchschnittliche Dateigr��e: %d Bytes (zur Inode-Bestimmung) }
 message isize_fmt_dflt
 { Durchschnittliche Dateigr��e:  4 Fragmente}
 message newfs_fmt
 {Neues Dateisystem (newfs): %8s}
 message mount_fmt
 {         Mount: %9s}
 message mount_options_fmt
 { Mountoptionen: }
 message mountpt_fmt
 {   Mount-Verz.: %9s}
 message toggle
 {W�hlen Sie}
 message restore
 {Urspr�ngliche Werte wiederherstellen}
 message Select_the_type
 {W�hlen Sie den Dateisystemtyp aus}
 message other_types
 {Andere Dateisystemtypen}
 message label_size
 {%s
 Spezielle Werte, die f�r die Gr��enangaben eingegeben werden k�nnen:
     -1:   bis zum Ende des NetBSD-Teils der Festplatte gehen
    a-%c:  Partition dort beenden, wo Partition X anf�ngt
 Gr��e (%s)}
 message label_offset
 {%s
 Spezielle Werte, die f�r den Start angegeben werden k�nnen:
     -1:   dort anfangen, wo der NetBSD Teil der Festplatte beginnt
    a-%c:  direkt hinter der angegebenen Partition starten (a, b, ..., %c)
 start (%s)}
 message invalid_sector_number
 {Ung�ltige Sektornummer
+}
 message Select_file_system_block_size
 {W�hlen Sie die Blockgr��e des Dateisystems aus}
 message Select_file_system_fragment_size
 {W�hlen Sie die Fragmentgr��e des Dateisystems aus}
 message packname
 {Bitte geben Sie Ihrer NetBSD-Festplatte einen Namen}
 message lastchance
 {NetBSD wird nun auf die Festplatte (%s) installiert. Noch wurde nichts
 geschrieben. Dies ist Ihre letzte Chance, diesen Prozess abzubrechen.
 M�chten Sie fortfahren?
+}
 message disksetupdone
 {Der erste Teil der Installation ist nun abgeschlossen.
 Sysinst hat das von Ihnen gew�hlte Ziellaufwerk partitioniert und
 auf allen von Ihnen gew�hlten Partitionen ein Dateisystem initialisiert
 und gepr�ft.
+}
 message disksetupdoneupdate
 {Der erste Teil der Prozedur ist nun abgeschlossen.
 Sysinst hat das von Ihnen gew�hlte Ziellaufwerk partitioniert und
 und alle gew�hlten Dateisysteme auf Fehler �berpr�ft.
+}
 message openfail
 {Konnte %s nicht �ffnen, die Fehlermeldung lautet: %s.
+}
 message mountfail
 {Das Mounten des Ger�tes /dev/%s%c auf %s ist fehlgeschlagen.
+}
 message extractcomplete
 {Das Extrahieren der ausgew�hlten Sets f�r NetBSD-@@VERSION@@ ist abgeschlossen.
 Das System ist somit f�hig, von der ausgew�hlten Partition zu starten. Um die
 Installation zu vervollst�ndigen, gibt Ihnen sysinst die M�glichkeit, eine
 grundlegende Konfiguration vorzunehmen.
+}
 message instcomplete
 {Die Installation von NetBSD-@@VERSION@@ ist jetzt fertiggestellt. Das System
 sollte von der Festplatte starten k�nnen. Beachten Sie die INSTALL-Anleitung,
 um sich �ber die weitere Konfiguration zu informieren.
 Auch die afterboot(8) Manpage ist weiterzuempfehlen; Sie enth�lt eine Liste
 mit Punkten, die nach dem ersten vollst�ndigen Start gepr�ft werden sollten.
 Zumindest aber sollten Sie die /etc/rc.conf entsprechend Ihren Bed�rfnissen
 konfigurieren. Werfen Sie einen Blick in /etc/defaults/rc.conf rein, wo Sie
 die Vorgaben f�r diese Datei finden.
+}
 message upgrcomplete
 {Die Installation von NetBSD-@@VERSION@@ ist jetzt fertiggestellt. Sie m�ssen
 nun die Anweisungen im INSTALL-Dokument beachten, damit Ihr System -
 entsprechend Ihrer Situation - neu konfiguriert werden kann.
 Lesen Sie (erneut) die afterboot(8) Manpage, da diese seit Ihrer letzten
 Aktualisierung bzw. Installation zus�tzliche Angaben enthalten kann.
 Sie sollten wenigstens rc.conf �ndern; dort gilt es rc_configured=NO auf
 rc_configured=YES umzustellen, da das System sonst nur bis zum Single User
 Modus (Einbenutzermodus) startet.
+}
 message unpackcomplete
 {Das Entpacken der zus�tzlichen Releasesets von NetBSD-@@VERSION@@ ist nun
 beendet.
 Sie sollten nun die Anweisungen im INSTALL Dokument beachten, um
 Ihr System Ihrer Konfiguration entsprechend einzurichten. Die afterboot(8)
 Manpage kann ebenfalls n�tzlich sein.
 Zumindest m�ssen Sie die Datei rc.conf editieren, so da� die gew�nschten
 Dienste gestartet werden. Vergessen Sie nicht, rc_configured=NO auf
 rc_configured=YES umzustellen.
+}
 message distmedium
 {Ihre Festplatte ist nun bereit f�r die Installation der Kernel- und
 Distributionspakete. Wie im INSTALL-Dokument beschrieben, haben Sie nun
 mehrere Optionen.
 F�r FTP oder NFS m�ssen Sie mit einem Netzwerk verbunden sein und
 Zugriff auf die entsprechenden Server haben.
 Insgesamt %d Pakete ausgew�hlt, %d installiert. N�chstes Set: %s.
+}
 message distset
 {Die NetBSD Distribution ist in verschiedene Pakete (Sets) aufgeteilt.
 Es gibt einige grundlegende Pakete, die auf jeden Fall ben�tigt werden,
 sowie optionale.
 Es bleibt Ihnen �berlassen, ein Basissystem (Minimale Installation) oder
 alle Pakete (volle Installation) zu installieren bzw. einen benutzer-
 definierten Satz auszuw�hlen.
+}
 message ftpsource
 {Dies sind die Daten zum Aufbau einer %s-Verbindung.
 Falls der Benutzer "ftp" ist, ben�tigen Sie kein Passwort.
+}
 message email
 {E-Mail-Adresse}
 message dev
 {Laufwerk}
 message nfssource
 {Geben Sie den NFS-Server samt Verzeichnis an, auf dem die Distribution zu
 finden ist.
 (Das Verzeichnis muss .tgz Dateien enthalten und �ber NFS mountbar sein.)
+}
 message floppysource
 {Geben Sie das Diskettenlaufwerk und das Transfer-Verzeichnis auf dem
 Zieldateisystem an. Das Installationspaket mu� direkt im obersten
 Verzeichnis der Diskette liegen.
+}
 message cdromsource
 {Geben Sie das CD-Laufwerk und das entsprechende Verzeichnis an, in dem
 die Distribution zu finden ist.
 (Das Verzeichnis muss .tgz Dateien enthalten.)
+}
 message Available_cds
 {Verf�gbare CDs}
 message ask_cd
 {Es wurden mehrere CDs gefunden. Bitte w�hlen Sie die Installations CD aus.}
 message cd_path_not_found
 {Die Installationsdateien wurden auf der ausgew�hlten CD nicht gefunden. Bitte
 pr�fen Sie den Ger�tenamen und Pfad der Installationsdateien.}
 message localfssource
 {Geben Sie das noch nicht gemountete lokale Ger�t und dessen entsprechendes
 Verzeichnis an, in dem die Distribution zu finden ist.
 (Das Verzeichnis muss .tgz Dateien enthalten.)
+}
 message localdir
 {Geben Sie das Verzeichnis des bereits gemounteten lokalen Ger�ts an, in dem
 die Distribution zu finden ist.
 (Das Verzeichnis muss .tgz Dateien enthalten.)
+}
 message filesys
 {Dateisystem}
 message nonet
 {NetBSD hat keinen bekannten Netzwerkadapter gefunden.
 Zur�ck zum vorigen Men�.
+}
 message netup
 {Die folgenden Netzwerkadapter sind verf�gbar: %s
 Hat einer davon Zugriff auf die ben�tigten Server?}
 message asknetdev
 {Welchen Netzwerkadapter m�chten Sie benutzen?}
 message netdevs
 {Verf�gbare schnittstellen}
 message netinfo
 {Um das Netzwerk nutzen zu k�nnen, ben�tigen wir folgende Angaben:
+}
 message net_domain
 {DNS-Domain}
 message net_host
 {Hostname}
 message net_ip
 {IPv4-Adresse}
 message net_srv_ip
 {IPv4-Adressse des Servers}
 message net_mask
 {IPv4-Netzmaske}
 message net_namesrv
 {IPv4-Nameserver}
 message net_defroute
 {IPv4-Gateway}
 message net_media
 {Art der Netzwerkverbindung}
 message netok
 {Nachfolgend sehen Sie die aktuellen Netzwerkeinstellungen.
 DNS-Domain:		%s
 Hostname:		%s
 Nameserver:		%s
 Netzwerkadapter:	%s
 Verbindungstyp:		%s
 IP-Adresse:		%s
 Netzmaske:		%s
 IPv4-Gateway:		%s
+}
 message netok_slip
 {Sie haben die folgenden Daten gew�hlt. Sind diese Daten OK?
 DNS-Domain:		%s
 Hostname:		%s
 Nameserver:		%s
 Netzwerkadapter:	%s
 Verbindungstyp:		%s
 IP-Adresse:		%s
 IP-Adresse des Servers:	%s
 Netzmaske:		%s
 IPv4-Gateway:		%s
+}
 message netokv6
+{
 IPv6-Autokonfiguration:	%s
+}
 message netok_ok
 {Sind diese OK?}
 message slattach {
 Flags f�r slattach
+}
 message wait_network
+{
 Bitte warten Sie, w�hrend die Netzwerkger�te initialisiert werden.
+}
 message resolv
 {Konnte /etc/resolv.conf nicht erstellen. Installation abgebrochen.
+}
 message realdir
 {Konnte nicht in das Verzeichnis %s: %s wechseln. Installation abgebrochen.
+}
 message delete_xfer_file
 {Nach der Installation l�schen}
 message notarfile
 {Das Release-Paket %s existiert nicht.}
 message endtarok
 {Alle Distributionspakete wurden erfolgreich entpackt.}
 message endtar
 {Beim Entpacken der Distributionspakete sind Probleme aufgetreten.
 Ihre Installation ist daher unvollst�ndig.
 Sie haben %d Distributionssets ausgew�hlt. %d davon wurden nicht
 gefunden und %d wegen eines Fehlers �bersprungen.
 Von %d zu entpackenden Paketen sind %d erfolgreich und %d
 mit Fehler entpackt worden.
 Die Installation wird abgebrochen. Bitte pr�fen Sie die Bezugsquellen Ihrer
 Distribution und installieren Sie gegebenfalls die Pakete erneut.}
 message abort
 {Ihre Auswahl erm�glicht keine NetBSD-Installation. Installation abgebrochen.
+}
 message abortinst
 {Die Distribution konnte nicht geladen werden. Sie m�ssen manuell fortfahren.
 Installation abgebrochen.
+}
 message abortupgr
 {Die Distribution konnte nicht geladen werden. Sie m�ssen manuell fortfahren.
 Aktualisierung abgebrochen.
+}
 message abortunpack
 {Das Entpacken der zus�tzlichen Pakete ist fehlgeschlagen. Sie m�ssen
 entweder manuell fortfahren oder eine andere Bezugsquelle f�r die Release-
 Pakete angeben und es erneut versuchen.
+}
 message createfstab
 {Un�berwindliches Problem! Die Datei /mnt/etc/fstab konnte nicht erstellt
 werden. Der Vorgang wird abgebrochen.
+}
 message noetcfstab
 {Hilfe! Die Datei /etc/fstab konnte im Ziellaufwerk %s nicht gefunden
 werden. Die Aktualisierung wird abgebrochen.
+}
 message badetcfstab
 {Hilfe! Es besteht eine fehlerhafte /etc/fstab im Ziellaufwerk %s. Die
 Aktualisierung wird abgebrochen.
+}
 message X_oldexists
 {Der alte X Server %s/bin/X kann nicht als %s/bin/X.old
 gesichert werden, da eine Datei mit diesem Namen bereits existiert.
 Bitte korrigieren Sie dies, bevor Sie fortfahren.
 Eine M�glichkeit ist es, im Extras-Men� eine Shell zu starten,
 wodurch Sie %s/bin/X.old �berpr�fen k�nnen. Geh�rt diese Datei zu
 einer fr�heren Aktualisierung, so k�nnen Sie diese mit rm -f
 %s/bin/x.old l�schen und danach die Aktualisierung neu starten.
 Geh�rt die Datei %s/bin/X.old aber zu einer aktuellen,
 abgebrochenen Aktualisierung, so k�nnen Sie die Datei %s/bin/X mit
 mv %s/bin/X.old %s/bin/X wieder herstellen und die
 unvollst�ndige Aktualisierung fortsetzen. %0s%0s%0s
 Aktualisierung wird abgebrochen.}
 message netnotup
 {Beim Testen des Netzwerks ist ein Problem aufgetreten. Entweder Ihr
 Gateway oder Ihr Nameserver hat nicht auf "ping" reagiert. Wollen Sie Ihre
 Netzwerkkonfiguration �berarbeiten?
 ("Nein" erm�glicht Ihnen die Fortsetzung oder den Abbruch der Installation.)
+}
 message netnotup_continueanyway
 {Wollen Sie die Installation dennoch fortsetzen? Sie k�nnen sich auch
 sp�ter um das Netzwerk k�mmern. ("Nein" bricht die Installation ab.)
+}
 message makedev
 {Erstelle Ger�tedateien in /dev ...
+}
 message badfs
 {Das Dateisystem auf /dev/%s%c scheint kein BSD-Dateisystem zu sein,
 die Pr�fung des Dateisystems (fsck) ist fehlgeschlagen (Fehler %d).
 Die Aktualisierung trotzdem fortsetzen?
+}
 message rootmissing
 {Das Zielverzeichnis %s existiert nicht.
+}
 message badroot
 {Das neu installierte root Dateisystem scheint unvollst�ndig zu sein.
 Sind Sie sicher, dass Sie alle ben�tigten Sets installiert haben?
+}
 message fd_type
 {Floppy Dateisystem-Typ}
 message fdnotfound
 {Ich konnte die Datei nicht finden.
+}
 message fdremount
 {Die Diskette konnte nicht gemountet werden.
+}
 message fdmount
 {Bitte legen Sie die Diskette mit der Datei "%s.%s" ein.
 Falls das Paket keine weiteren Disketten enth�lt, w�hlen Sie
 "Paket fertig" um das Paket zu installieren. W�hlen Sie
 "Holen abbrechen" um zur Auswahl des Installationsmediums
 zur�ckzukehren.
+}
 .if 0
 message fdmount
 {Bitte legen Sie die Diskette ein, auf der sich die Datei "%s.%s" befindet. }
 message fdnotfound
 {Ich konnte die Datei "%s.%s" nicht finden. Bitte legen Sie die entsprechende
 Diskette ein.
 Wenn dies die letzte Diskette des Paketes war, w�hlen Sie "Paket fertig",
 um zum n�chsten Paket �berzugehen - falls ein weiteres Paket folgt.}
 message fdremount
 {Die Diskette konnte nicht gemountet werden.
 Sie sollten:
 Erneut probieren, die Diskette mit der Datei "%s.%s" einzulegen.
 Keine weiteren Disketten f�r dieses Paket laden, und stattdessen mit dem
 n�chsten Paket fortfahren - falls ein weiteres existiert.
 Keine weiteren Pakete mehr vom dem Diskettenlaufwerk laden und die Installation
 abbrechen.
+}
 .endif
 message mntnetconfig
 {M�chten Sie die aktuellen Netzwerkeinstellungen f�r den allgemeinen
 Gebrauch in /etc speichern?}
 message cur_distsets
 {Die folgenden Distributionspakete werden verwendet:
+}
 message cur_distsets_header
 {   Distributionspaket       Ausgew�hlt
    ------------------------ ----------
+}
 message set_base
 {Basispaket}
 message set_system
 {Systemkonfiguration (/etc)}
 message set_compiler
 {Compiler}
 message set_games
 {Spiele}
 message set_man_pages
 {Handbuchseiten (man pages)}
 message set_misc
 {Verschiedenes}
 message set_modules
 {Kernel Modules}
 message set_tests
 {Testprogramme}
 message set_text_tools
 {Textbearbeitung}
 message set_X11
 {X11 Sets}
 message set_X11_base
 {X11 Basis und Clients}
 message set_X11_etc
 {X11 Konfiguration}
 message set_X11_fonts
 {X11 Schriftarten}
 message set_X11_servers
 {X11 Server}
 message set_X11_prog
 {X11 Programmierung}
 message set_source
 {Quelltexte und Debug-Info}
 message set_syssrc
 {Kernel Quelltexte}
 message set_src
 {Basissystem Quelltexte}
 message set_sharesrc
 {Share Quelltexte}
 message set_gnusrc
 {GNU Quelltexte}
 message set_xsrc
 {X11 Quelltexte}
 message set_debug
 {Debug-Information}
 message set_xdebug
 {X11 Debug-Information}
 message cur_distsets_row
 {%-27s %3s}
 message select_all
 {Alle oben angezeigten Pakete ausw�hlen}
 message select_none
 {Kein Paket w�hlen}
 message install_selected_sets
 {Installieren der ausgew�hlten Pakete}
 message tarerror
 {Beim Extrahieren der Datei %s ist ein Fehler aufgetreten. Das bedeutet, dass
 nicht alle Dateien korrekt extrahiert wurden und Ihr System somit nicht
 vollst�ndig sein wird.
 M�chten Sie mit dem Extrahieren der Pakete fortfahren?}
 message must_be_one_root
 {F�r eine der Partitionen muss als Mountverzeichnis '/' festgelegt werden.}
 message partitions_overlap
 {Die Partitionen %c und %c �berlappen sich.}
 message No_Bootcode
 {Kein Bootcode f�r die Rootpartition vorhanden}
 message cannot_ufs2_root
 {Leider existiert f�r diese Maschine kein Bootloader f�r FFSv2 Dateisysteme,
 daher kann das Root-Dateisystem nicht im FFSv2 Format angelegt werden.}
 message edit_partitions_again
+{
 Sie k�nnen entweder die Partitionstabelle noch einmal editieren oder aber zum
 Hauptmen� zur�ckkehren.
 Wollen Sie die Partitionstabelle erneut editieren?}
 message config_open_error
 {Konnte Konfigurationsdatei %s nicht �ffnen.\n}
 message choose_timezone
 {Bitte w�hlen Sie die f�r Sie passende Zeitzone aus der folgenden Liste aus.
 Dr�cken Sie die Eingabetaste, um einen Eintrag anzuw�hlen. Bet�tigen Sie danach
 die Taste 'x' gefolgt von der Eingabetaste, um das Men� zu verlassen.
  Vorgabe:	%s
  Ausgew�hlt:	%s
  Lokale Zeit:	%s %s
+}
 message tz_back
 { Zur�ck zum Zeitzonenmen�.}
 message swapactive
 {Das Laufwerk, das Sie ausgew�hlt haben, verf�gt �ber eine Swappartition, die
 gegenw�rtig auch benutzt wird.
 Da Sie dabei sind, dieses Laufwerk erneut zu partitionieren, wird diese
 Swappartition jetzt deaktiviert, weshalb eventuell Speicherprobleme auftreten
 k�nnen. Sollte solch ein Fehler auftreten, starten Sie bitte Ihr System neu und
 probieren es erneut.}
 message swapdelfailed
 {Beim Versuch, die Swappartition des Laufwerks, das Sie f�r die Installation
 von NetBSD ausgew�hlt haben, zu deaktivieren, ist ein Fehler
 aufgetreten. Bitte starten Sie das System neu.}
 message rootpw
 {Das Rootpasswort f�r das neu installierte System wurde noch nicht gesetzt
 und ist somit leer. M�chten Sie jetzt ein Rootpasswort f�r das System setzen?}
 message rootsh
 {Sie k�nnen jetzt die Standardshell f�r Benutzer "root" ausw�hlen.
 Die Vorgabe daf�r ist /bin/sh, aber vielleicht bevorzugen Sie eine andere
 Shell.}
 message no_root_fs
+{
 F�r kein Dateisystem ist '/' als Mountverzeichnis gew�hlt. Sie m�ssen ein
 Dateisystem als '/' konfigurieren.
 Dr�cken Sie die Eingabetaste um fortzufahren.
+}
 message Pick_an_option {W�hlen Sie eine an- oder abzuschaltende Option.}
 message Scripting {Skripting}
 message Logging {Logging}
 message Status  {  Status: }
 message Command {Kommando: }
 message Running {ausf�hren}
 message Finished {fertig}
 message Command_failed {fehlgeschlagen}
 message Command_ended_on_signal {abgebrochen}
 message NetBSD_VERSION_Install_System {NetBSD-@@VERSION@@ Installationsprogramm}
 message Exit_Install_System {Installationsprogramm beenden}
 message Install_NetBSD_to_hard_disk {NetBSD auf die Festplatte installieren}
 message Upgrade_NetBSD_on_a_hard_disk {Aktualisierung einer bestehenden NetBSD-Installation}
 message Re_install_sets_or_install_additional_sets {Erneute Installation oder zus�tzliche Pakete installieren}
 message Reboot_the_computer {Computer neu starten}
 message Utility_menu {Extras}
 message Config_menu {Konfigurationsmen�}
 message exit_utility_menu {Zur�ck zum Hauptmen�}
 message exit_menu_generic {Zur�ck}
 message NetBSD_VERSION_Utilities {NetBSD-@@VERSION@@ Extras}
 message Run_bin_sh {Ausf�hren von /bin/sh}
 message Set_timezone {Setzen der Zeitzone}
 message Configure_network {Netzwerkkonfiguration}
 message Partition_a_disk {Partitionieren eines Laufwerks}
 message Logging_functions {Protokollierungsfunktionen (Logging)}
 message Halt_the_system {System herunterfahren}
 message yes_or_no {Ja oder Nein?}
 message Hit_enter_to_continue {Dr�cken Sie die Eingabetaste um fortzufahren.}
 message Choose_your_installation {W�hlen Sie Ihre Installation}
 message Set_Sizes {Gr��en der NetBSD-Partitionen festlegen}
 message Use_Existing {Bereits bestehende Partitionsgr��en beibehalten}
 message Megabytes {Megabytes}
 message Cylinders {Zylinder}
 message Sectors {Sektoren}
 message Select_medium {Medium ausw�hlen}
 message ftp {FTP}
 message http {HTTP}
 message nfs {NFS}
 .if HAVE_INSTALL_IMAGE
 message cdrom {CD-ROM / DVD / install image media}	/* XXX translation */
 .else
 message cdrom {CD-ROM / DVD}
 .endif
 message floppy {Diskette}
 message local_fs {Ungemountetes Dateisysytem}
 message local_dir {Lokales Verzeichnis}
 message Select_your_distribution {W�hlen Sie Ihre Pakete}
 message Full_installation {Volle Installation}
 message Full_installation_nox {Grundinstallation ohne X11}
 message Minimal_installation {Minimale Installation}
 message Custom_installation {Benutzerdefinierte Installation}
 message hidden {** versteckt **}
 message Host {Host}
 message Base_dir {Basispfad}
 message Set_dir_bin {Bin�rpaket-Verzeichnis}
 message Set_dir_src {Quelltext-Verzeichnis}
 message Xfer_dir {Zwischenspeicher}
 message User {Benutzer}
 message Password {Passwort}
 message Proxy {Proxy}
 message Get_Distribution {Distribution herunterladen}
 message Continue {Weiter}
 message What_do_you_want_to_do {Was m�chten Sie tun?}
 message Try_again {Versuchen Sie es erneut}
 message Set_finished {Paket fertig}
 message Skip_set {Paket �berspringen}
 message Skip_group {Paketgruppe �berspringen}
 message Abandon {Installation abbrechen}
 message Abort_fetch {Holen abbrechen}
 message Device {Ger�t}
 message File_system {Dateisystem}
 message Select_DNS_server {  Ausw�hlen eines DNS Servers}
 message other {andere }
 message Perform_autoconfiguration {F�hren Sie die automatische Konfiguration?}
 message Root_shell {Root-Shell}
 message User_shell {User-Shell}
 message Color_scheme {Farbschema}
 message White_on_black {Wei� auf schwarz}
 message Black_on_white {Schwarz auf wei�}
 message White_on_blue {Wei� auf Blau}
 message Green_on_black {Gr�n auf schwarz}
 .if AOUT2ELF
 message aoutfail
 {Das Verzeichnis, in das die alten a.out-Bibliotheken gesichert
 werden sollten, konnte nicht erstellt werden. Bitte starten Sie
 die Aktualisierung erneut und stellen Sie sicher, dass alle Dateisysteme
 gemountet sind.}
 message emulbackup
 {Eins der Verzeichnisse /emul/aout oder /emul war ein symbolischer
 Link, der auf ein nicht-gemountetes Dateisystem verwies. Der Link wurde
 mit einer '.old' Erweiterung versehen. Sobald Ihr aktualisiertes
 System gestartet ist, m�ssen Sie das neu erstellte /emul/aout mit dem alten
 Verzeichnis abgleichen.
+}
 .endif
 message oldsendmail
 {Sendmail ist nicht l�nger integrierter Bestandteil von NetBSD.
 Der Standard MTA ist nun Postfix. Ihr System benutzt derzeit
 eine Konfiguration in /etc/mailer.conf, die auf das nicht mehr
 vorhandene Sendmail-Programm verweist.
 M�chten Sie /etc/mailer.conf automatisch auf eine Version f�r
 Postfix umstellen? Falls Sie "Nein" w�hlen, m�ssen Sie anschlie�end
 manuell /etc/mailer.conf korrigieren, um funktionierende Mailauslieferung
 zu gew�hrleisten.}
 message license
 {Um den Netzwerkadapter %s zu benutzen m�ssen Sie der Lizenz in
 der Datei %s zustimmen.
 Um den Lizenztext zu lesen, geben Sie ^Z ein, schauen den Inhalt
 der Datei an und kehren mit dem Befehl "fg" zu sysinst zur�ck.}
 message binpkg
 {Um Bin�rpakete zu installieren, muss erst eine Netzwerkverbindung konfiguriert
 werden, �ber die die Pakete heruntergeladen werden. Nach einem ersten Start in
 das installierte System k�nnen mit dem Kommando 'pkgin' zus�tzliche Pakete
 installiert oder entfernt werden.}
 message pkgpath
 {Zur Konfiguration von pkgin muss zuerst das Repository konfiguriert werden.
 Welches Protokoll, welcher Host, welches Verzeichnis und welcher User/Passwort
 sollen zum Herunterladen verwendet werden? Wenn der User auf "ftp" gesetzt wird,
 dann wird kein Passwort ben�tigt.
+}
 message rcconf_backup_failed {rc.conf-Backup fehlgeschlagen. Trotzdem fortfahren?}
 message rcconf_backup_succeeded {rc.conf-Backup nach %s gespeichert.}
 message rcconf_restore_failed {rc.conf-Restore ist fehlgeschlagen.}
 message rcconf_delete_failed {L�schen des alten %s-Eintrages ist fehlgeschlagen.}
 message Pkg_dir {Paketverzeichnis}
 message configure_prior {Existierende Installation konfigurieren}
 message configure {Konfigurieren}
 message change {�ndern}
 message password_set {Passwort gesetzt}
 message YES {JA}
 message NO {NEIN}
 message DONE {ERLEDIGT}
 message abandoned {Abgebrochen}
 message empty {***LEER***}
 message timezone {Zeitzone}
 message change_rootpw {root-Passwort setzen}
 message enable_binpkg {Installation von Bin�rpaketen vorbereiten}
 message enable_sshd {sshd aktivieren}
 message enable_ntpd {ntpd aktivieren}
 message run_ntpdate {ntpdate beim Starten ausf�hren}
 message enable_mdnsd {mdnsd aktivieren}
 message enable_xdm {xdm aktivieren}
 message enable_cgd {cgd aktivieren}
 message enable_lvm {lvm aktivieren}
 message enable_raid {raidframe aktivieren}
 message add_a_user {Add a user}
 message configmenu {Zus�tzliche Einstellungen konfigurieren.}
 message doneconfig {Konfiguration abgeschlossen.}
 message Install_pkgin {pkgin installieren und Datenbank initialisieren}
 message binpkg_installed
 {Das System kann nun Bin�rpakete mittels pkgin installieren. Um ein Paket zu
 installieren, muss man folenden Befehl von einer root-Shell ausf�hren:
 pkgin install <packagename>
 Weitere Informationen finden sich in der pkgin(1)-Manpage.}
 message Install_pkgsrc {pkgsrc herunterladen und entpacken}
 message pkgsrc
 {Welches Protokoll, welcher Host, welches Verzeichnis und welcher User/Passwort
 sollen zum Herunterladen von pkgsrc verwendet werden? Wenn der User auf "ftp"
 gesetzt wird, dann wird kein Passwort ben�tigt.
+}
 message Pkgsrc_dir {pkgsrc-Verzeichnis}
 message get_pkgsrc {pkgsrc zur Installation von Quellpaketen herunterladen und
 installieren}
 message retry_pkgsrc_network {Netzwerkkonfiguration fehlgeschlagen. Noch einmal
 versuchen?}
 message quit_pkgsrc {Ohne Installation von pkgsrc beenden.}
 message quit_pkgs_install {Installation von bin�r-Paketen beenden.}
 message pkgin_failed
 {Die Installation von pkgin ist fehlgeschlagen, evtl. weil keine Bin�rpakete
 vorhanden sind. Bitte den Pfad der Pakete �berpr�fen und noch einmal versuchen.}
 message failed {Fehlgeschlagen}
 message notsupported {Operation wird nicht unterst�tzt!}
 message askfsmountadv {Mountpoint oder 'raid' oder 'cgd' oder 'lvm'?}
 message partman {Erweiterte Partitionierung}
 message editbsdpart {Bearbeiten BSD-Partitionen}
 message editmbr {Bearbeiten und speichern MBR}
 message switchgpt {Wechseln Sie zu GPT}
 message switchmbr {Wechseln Sie zu MBR}
 message renamedisk {Stellen Sie Festplatten-Namen}
 message fmtasraid {Format als RAID}
 message fmtaslvm {Format als LVM-PV}
 message encrypt {Verschl�sseln}
 message setbootable {Boot-Flag}
 message erase {Safe Erase}
 message undo {R�ckg�ngigmachen von �nderungen}
 message unconfig {Dekonfigurieren}
 message edit {Bearbeiten}
 message doumount {Force-umount}
 message fillzeros {F�llen von Nullen}
 message fillrandom {F�llen von zuf�lligen Daten}
 message fillcrypto {F�llen von Crypto-Daten}
 message raid0 {0 - Keine Parit�t, nur einfache Striping.}
 message raid1 {1 - Mirroring. Die Parit�t ist der Spiegel.}
 message raid4 {4 - Striping mit Parit�t auf die letzte Komponente gespeichert.}
 message raid5 {5 - Striping mit Parit�t an den alle Komponenten.}
 message fremove {ENTFERNEN}
 message remove {Entfernen}
 message add {Hinzuf�gen}
 message auto {auto}
 message removepartswarn {Diese entfernen Sie alle Partitionen auf der Festplatte. Wollen Sie fortsetzen?}
 message saveprompt {Speichern Sie die �nderungen vor dem Abschluss?}
 message cantsave {�nderungen k�nnen nicht gespeichert werden.}
 message noroot {Kein Root-Partition definiert ist, kann nicht fortgesetzt werden \n}
 message wannaunblock {Das Ger�t ist blockiert. Wollen Sie zwingen sie zu entsperren und weiter?}
 message wannatry {Wollen Sie probieren?}
 message create_cgd {Erstellen kryptographische Volumen (CGD)}
 message create_cnd {Erstellen Sie virtuelle Disk-Image (VND)}
 message create_vg {Erstellen Volume-Gruppe (LVM VG)}
 message create_lv {      Erstellen logischer Volumen}
 message create_raid {Erstellen Software-RAID}
 message updpmlist {Aktualisieren Sie Ger�te-Liste}
 message savepm {Speichern Sie die �nderungen}
 message pmblocked {GESPERRT}
 message pmunchanged {NICHTS}
 message pmsetboot {BOOTEN}
 message pmused {BENUTZT}
 message pmmounted {(montiert)}
 message pmunused {(unbenutzt)}
 message pmgptdisk {Festplatte mit GPT}
 message finishpm {Partitionierung beenden}
 message limitcount {Grenze f�r die Anzahl der Ger�te erreicht wurde!}
 message invaliddev {Ung�ltige Ger�t!}
 message avdisks {Verf�gbare Festplatten:}
 message nofreedev {Kann nicht zugewiesen werden Ger�teknoten!}
 message partman_header
 {Partition Manager. Alle Festplatten, Partitionen usw. und dort angezeigt.
 Auf den ersten MBR-Partitionen machen, dann machen BSD-Label.
 Wenn Sie RAID verwenden, LVM oder CGD, gehen Sie folgenderma�en vor:
 ) Erstellen BSD-Partitionen mit Typ ben�tigt; 2) Erstellen Sie RAID /
 LVM VG / CGD mit diesen Partitionen; 3) Speichern Sie es;
 ) Erstellen Sie Partitionen f�r RAID / CGD oder Logical Volumes f�r LVM.}
 message raid_menufmt {   raid%d (ebene %1d) on %-34s %11uM}
 message raid_err_menufmt {   LEER RAID!}
 message raid_disks_fmt {Festplatten: %27s}
 message raid_spares_fmt {Ersatzbedarf: %26s}
 message raid_level_fmt {RAID ebene:       %22d}
 message raid_numrow_fmt {numRow:           %22d}
 message raid_numcol_fmt {numCol:           %22d}
 message raid_numspare_fmt {numSpare:         %22d}
 message raid_sectpersu_fmt {sectPerSU:        %22d}
 message raid_superpar_fmt {SUsPerParityUnit: %22d}
 message raid_superrec_fmt {SUsPerReconUnit:  %22d}
 message raid_nomultidim {Mehrdimensionale Arrays werden nicht unterst�tzt!}
 message raid_numrow_ask {numRow?}
 message raid_numcol_ask {numCol?}
 message raid_numspare_ask {numSpare?}
 message raid_sectpersu_ask {sectPerSU?}
 message raid_superpar_ask {SUsPerParityUnit?}
 message raid_superrec_ask {SUsPerReconUnit?}
 message raid_disks {Festplatten im RAID:}
 message vnd_err_menufmt {   PATH nicht definiert!}
 message vnd_assgn_menufmt {   vnd%1d auf %-50s ASSIGN}
 message vnd_menufmt {   vnd%1d auf %-44s %11uM}
 message vnd_path_fmt {Dateipfad: %29s}
 message vnd_assgn_fmt {Neue Image-Datei erstellen: %12s}
 message vnd_size_fmt {Gr��e:           %22sM}
 message vnd_ro_fmt {Nur lesen:        %22s}
 message vnd_geom_fmt {Manuelle Geometrie: %8s}
 message vnd_bps_fmt {Byte pro Sektor:      %18s}
 message vnd_spt_fmt {Sektoren pro Spur:    %18s}
 message vnd_tpc_fmt {Spuren pro Zylinder:  %18s}
 message vnd_cyl_fmt {Zylinder:         %22s}
 message vnd_path_ask {Dateipfad?}
 message vnd_size_ask {Gr��e (MB)?}
 message vnd_bps_ask {Byte pro Sektor?}
 message vnd_spt_ask {Sektoren pro Spur?}
 message vnd_tpc_ask {Spuren pro Zylinder?}
 message vnd_cyl_ask {Zylinder?}
 message cgd_err_menufmt {   DISK NICHT DEFINIERT!}
 message cgd_menufmt {   cgd%1d %-48s %11uM}
 message cgd_dev_fmt {Grundger�t:     %24s}
 message cgd_enc_fmt {Mausklick und:  %24s}
 message cgd_key_fmt {Schl�sselgr��e: %24d}
 message cgd_iv_fmt {IV-Algorithmus: %24s}
 message cgd_keygen_fmt {Schl�sselgenerierung: %18s}
 message cgd_verif_fmt {Verification Methode: %18s}
 message lvm_disks {Festplatten im VG:}
 message lvm_menufmt {   %-44s %20sM}
 message lvm_err_menufmt {   VG LEER!}
 message lvm_disks_fmt {PV's: %34s}
 message lvm_name_fmt {Name: %34s}
 message lvm_maxlv_fmt {MaxLogicalVolumes:  %20s}
 message lvm_maxpv_fmt {MaxPhysicalVolumes: %20s}
 message lvm_extsiz_fmt {PhysicalExtentSize: %20s}
 message lvm_name_ask {Name?}
 message lvm_maxlv_ask {MaxLogicalVolumes?}
 message lvm_maxpv_ask {MaxPhysicalVolumes?}
 message lvm_extsiz_ask {PhysicalExtentSize (MB)?}
 message lvmlv_menufmt {      Logische Volumen%-35s% 11uM}
 message lvmlv_name_fmt {Name: %34s}
 message lvmlv_size_fmt {Gr��e: %32dM}
 message lvmlv_ro_fmt {Nur lesen:  %27s}
 message lvmlv_cont_fmt {Zusammenh�ngend: %23s}
 message lvmlv_extnum_fmt {LogicalExtentsNumber: %18s}
 message lvmlv_minor_fmt {Minor-Nummer: %26s}
 message lvmlv_mirrors_fmt {Mirrors: %27d}
 message lvmlv_regsiz_fmt {MirrorLogRegionSize: %18s}
 message lvmlv_pers_fmt {Persistent Minor-Nummer: %14s}
 message lvmlv_readahsect_fmt {ReadAheadSectors: %18s}
 message lvmlv_stripes_fmt {Stripes: %27s}
 message lvmlv_stripesiz_fmt {StripeSize: %27s}
 message lvmlv_zero_fmt {Nullsetzen der ersten KB:% 13s}
 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,1244 +1,1254 @@
-/*	$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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of Piermont Information Systems Inc. may not be used to endorse
  *    or promote products derived from this software without specific prior
  *    written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``AS IS''
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PIERMONT INFORMATION SYSTEMS INC. BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 /* MI Message catalog -- spanish, machine independent */
 message usage
 {uso: sysinst [-D] [-f fichero_definici�n] [-r versi�n] [-C bg:fg]
+}
 /*
  * We can not use non ascii characters in this message - it is displayed
  * before the locale is set up!
  */
 message sysinst_message_language
 {Mensajes de instalacion en castellano}
 message sysinst_message_locale
 {es_ES.ISO8859-15}
 message Yes {S�}
 message No {No}
 message All {Todo}
 message Some {Algunos}
 message None {Ninguno}
 message none {ninguno}
 message OK {OK}
 message ok {ok}
 message On {Activado}
 message Off {Desactivado}
 message unchanged {sin cambios}
 message Delete {�Borrar?}
 message install
 {instalar}
 message reinstall
 {reinstalar conjuntos para}
 message upgrade
 {actualizar}
 message hello
 {Bienvenido a sysinst, la herramienta de instalaci�n de NetBSD-@@VERSION@@.
 Esta herramienta guiada por men�s est� dise�ada para ayudarle a instalar
 NetBSD en un disco duro, o actualizar un sistema NetBSD existente con
 un trabajo m�nimo.
 En los siguientes men�s teclee la letra de referencia (a, b, c, ...) para
 seleccionar una opci�n, o teclee CTRL+N/CTRL+P para seleccionar la opci�n
 siguiente/anterior.
 Las teclas de cursor y AvP�g/ReP�g puede que tambi�n funcionen.
 Active la selecci�n actual desde el men� pulsando la tecla Intro.
+}
 message thanks
 {�Gracias por usar NetBSD!
+}
 message installusure
 {Ha escogido instalar NetBSD en su disco duro.  Esto cambiar� informaci�n
 de su disco duro.  �Deber�a haber hecho una copia de seguridad completa
 antes de este procedimiento!  Este procedimiento realizar� las siguientes
 operaciones:
 	a) Particionar su disco
 	b) Crear nuevos sistemas de ficheros BSD
 	c) Cargar e instalar los conjuntos de distribuci�n
 	d) Algunas configuraciones iniciales del sistema
 (Despu�s de introducir la informaci�n de las particiones pero antes de que
 su disco sea cambiado, tendr� la oportunidad de salir del programa.)
 �Desea continuar?
+}
 message upgradeusure
 {Se va a actualizar NetBSD en su disco duro.  Sin embargo, esto
 cambiar� informaci�n de su disco duro.  �Deber�a hacer una copia de seguridad
 completa antes de este procedimiento!  �Realmente desea actualizar NetBSD?
 (�ste es su �ltimo aviso antes de que el programa empiece a modificar
 sus discos.)
+}
 message reinstallusure
 {Se va a desempaquetar los conjuntos de distribuci�n de NetBSD
 a un disco duro marcado como arrancable.  Este procedimiento solamente
 descarga y desempaqueta los conjuntos en un disco arrancable preparticionado.
 No pone nombre a los discos, ni actualiza los bloques de arranque, ni guarda
 ninguna informaci�n de configuraci�n.  (Salga y escoja `instalar' o
 `actualizar' si quiere esas opciones.)  �Ya deber�a haber hecho un
 `instalar' o `actualizar' antes de iniciar este procedimiento!
 �Realmente quiere reinstalar los conjuntos de la distribuci�n NetBSD?
 (�ste es su �ltimo aviso antes de que el programa empiece a modificar
 sus discos.)
+}
 message mount_failed
 {No se ha podido montar %s.  �Desea continuar?
+}
 message nodisk
 {No se ha podido encontrar ning�n disco duro para ser usado por NetBSD.
 Se le volver� a llevar al men� original.
+}
 message onedisk
 {Solamente se ha encontrado un disco, %s.
 Por tanto se entiende que quiere %s NetBSD en �l.
+}
 message ask_disk
 {�En cu�l disco quiere %s NetBSD? }
 message Available_disks
 {Discos disponibles}
 message heads
 {cabezas}
 message sectors
 {sectores}
 message fs_isize
 {tama�o promedio del fichero (bytes)}
 message mountpoint
 {punto de montaje (o 'ninguno')}
 message cylname
 {cil}
 message secname
 {sec}
 message megname
 {MB}
 message layout
 {NetBSD usa una etiqueta de BSD para dividir la porci�n NetBSD del disco
 en varias particiones BSD.  Ahora deber�a configurar su etiqueta BSD.
 Puede usar un simple editor para establecer los tama�os de las particiones
 NetBSD, o mantener los tama�os de partici�n y contenidos actuales.
 Despu�s se la dar� la oportunidad de cambiar cualquier campo de la
 etiqueta.
 La parte NetBSD de su disco es de %d megabytes.
 Una instalaci�n completa requiere al menos %d megabytes sin X y
 al menos %d megabytes si se incluyen los conjuntos de X.
+}
 message Choose_your_size_specifier
 {Seleccionar megabytes producir� tama�os de partici�n cercanos a su
 elecci�n, pero alineados a los limites de los cilindros.
 Seleccionar sectores le permitir� especificar los tama�os de manera
 m�s precisa.  En discos ZBR modernos, el tama�o real del cilindro var�a
 a lo largo del disco y no hay mucha ventaja real en el alineamiento de
 cilindros.  En discos m�s viejos, lo m�s eficiente es seleccionar
 tama�os de partici�n que sean multiples exactos del tama�o real del
 cilindro.
 Escoja su especificador de tama�o}
 message ptnsizes
 {Ahora puede cambiar los tama�os de las particiones del sistema.  Por
 omisi�n se asigna todo el espacio al sistema de archivos ra�z, sin embargo
 usted podr�a querer separar /usr (ficheros de sistema adicionales), /var
 (ficheros de registro, etc) o /home (directorios de usuario).
 El espacio libre sobrante ser� a�adido a la partici�n marcada con �+�.
+}
 message ptnheaders
+{
        MB         Cilindros	Sectores  Sistema de archivos
+}
 message askfsmount
 {�Punto de montaje?}
 message askfssize
 {�Tama�o de %s en %s?}
 message askunits
 {Cambiar las unidades de entrada (sectores/cilindros/MB)}
 message NetBSD_partition_cant_change
 {Partici�n NetBSD}
 message Whole_disk_cant_change
 {Todo el disco}
 message Boot_partition_cant_change
 {Partici�n de arranque}
 message add_another_ptn
 {A�adir una partici�n definida por el usuario}
 message fssizesok
 {Aceptar los tama�os de las particiones.  Espacio libre %d %s, %d particiones libres.}
 message fssizesbad
 {Reducir los tama�os de las particiones en %d %s (%u sectores).}
 message startoutsidedisk
 {El valor del comienzo que ha especificado est� mas all� del final del disco.
+}
 message endoutsidedisk
 {Con este valor, el final de la partici�n est� mas all� del final del disco.
 El tama�o de la partici�n se ha truncado a %d %s.
 Presione Intro para continuar
+}
 message toobigdisklabel
+{
 This disk is too large for a disklabel partition table to be used
 and hence cannot be used as a bootable disk or to hold the root
 partition.
+}
 message fspart
 {Sus particiones con etiquetas BSD est�n ahora as�.
 �sta es su �ltima oportunidad para cambiarlas.
+}
 message fspart_header
 {   Inicio %3s Fin %3s   Tama�o %3s Tipo FS    Newfs Mont. Punto mont.
    ---------- --------- ---------- ---------- ----- ----- -----------
+}
 message fspart_row
 {%10lu %9lu %10lu %-10s %-5s %-5s %s}
 message show_all_unused_partitions
 {Mostrar todas las particiones no usadas}
 message partition_sizes_ok
 {Tama�os de partici�n ok}
 message edfspart
 {Los valores actuales de la particion `%c' son,
 Seleccione el campo que desee cambiar:
                           MB cilindros  sectores
 	             ------- --------- ---------
+}
 message fstype_fmt
 {        FStype: %9s}
 message start_fmt
 {        inicio: %9u %8u%c %9u}
 message size_fmt
 {        tama�o: %9u %8u%c %9u}
 message end_fmt
 {           fin: %9u %8u%c %9u}
 message bsize_fmt
 {tama�o  bloque: %9d bytes}
 message fsize_fmt
 {   tama�o frag: %9d bytes}
 message isize_fmt
 {tam prom archi: %9d bytes (para n�mero de inodos)}
 message isize_fmt_dflt
 {tam prom archi:         4 fragmentos}
 message newfs_fmt
 {         newfs: %9s}
 message mount_fmt
 {        montar: %9s}
 message mount_options_fmt
 {   opc montaje: }
 message mountpt_fmt
 { punto montaje: %9s}
 message toggle
 {Conmutar}
 message restore
 {Restaurar los valores originales}
 message Select_the_type
 {Seleccione el tipo}
 message other_types
 {otros tipos}
 message label_size
 {%s
 Valores especiales que se pueden introducir para el valor del tama�o:
     -1:   usar hasta el final de la parte NetBSD del disco
    a-%c:   terminar esta partici�n donde empieza la partici�n X
 tama�o (%s)}
 message label_offset
 {%s
 Valores especiales que se pueden introducir para el valor del desplazamiento:
     -1:   empezar al principio de la parte NetBSD del disco
    a-%c:   empezar al final de la partici�n anterior (a, b, ..., %c)
 inicio (%s)}
 message invalid_sector_number
 {N�mero de sector mal formado
+}
 message Select_file_system_block_size
 {Seleccione el tama�o de bloque del sistema de archivos}
 message Select_file_system_fragment_size
 {Seleccione el tama�o de fragmento del sistema de archivos}
 message packname
 {Por favor entroduzca un nombre para el disco NetBSD}
 message lastchance
 {Bien, todo est� preparado para instalar NetBSD en su disco duro (%s).
 Todav�a no se ha escrito nada.  �sta es su �ltima oportunidad para salir
 del proceso antes de que se cambie nada.
 �Desea continuar?
+}
 message disksetupdone
 {De acuerdo, la primera parte del procedimiento ha terminado.
 Sysinst ha escrito una etiqueta en el disco objetivo, y ha
 formateado y comprobado las nuevas particiones que ha indicado
 para el disco objetivo.
+}
 message disksetupdoneupdate
 {De acuerdo, la primera parte del procedimiento ha terminado.
 Sysinst ha escrito una etiqueta en el disco objetivo, y
 comprobdo las nuevas particiones que ha indicado para el disco objetivo.
+}
 message openfail
 {No se ha podido abrir %s, el mensaje de error ha sido: %s.
+}
 message mountfail
 {el montaje del dispositivo /dev/%s%c en %s ha fallado.
+}
 message extractcomplete
 {La extracci�n de los conjuntos seleccionados para NetBSD-@@VERSION@@ ha
 finalizado.  El sistema es ahora capaz de arrancar desde el disco duro
 seleccionado.  Para completar la instalaci�n, sysinst le dar� la
 oportunidad de configurar antes algunos aspectos esenciales.
+}
 message instcomplete
 {La instalaci�n de NetBSD-@@VERSION@@ ha finalizado.  El sistema deber�a
 arrancar desde el disco duro.  Siga las instrucciones del documento
 INSTALL sobre la configuraci�n final del sistema.  La pagina de manual
 de afterboot(8) es otra lectura recomendada; contiene una lista de
 cosas a comprobar desp�es del primer arranque completo.
 Como m�nimo, debe editar /etc/rc.conf para que cumpla sus necesidades.
 Vea en /etc/defaults/rc.conf los valores predefinidos.
+}
 message upgrcomplete
 {Actualizaci�n a NetBSD-@@VERSION@@ completada.  Ahora tendr� que
 seguir las instrucciones del documento INSTALL para hacer lo que
 necesite para conseguir tener el sistema configurado para su
 situaci�n.
 Recuerde (re)leer la p�gina de manual de afterboot(8), ya que puede
 contener nuevos apartados desde su ultima actualizaci�n.
 Como m�nimo, debe editar rc.conf para su entorno local y cambiar
 rc_configured=NO a rc_configured=YES o los reinicios se detendr�n en
 single-user, y copie de nuevo los ficheros de contrase�as (teniendo en
 cuenta las nuevas cuentas de sistema que se hayan podido crear para esta
 versi�n) si estuviera usando ficheros de contrase�as locales.
+}
 message unpackcomplete
 {Finalizado el desempaquetamiento de conjuntos adicionales de NetBSD-@@VERSION@@.
 Ahora necesitar� seguir las instrucciones del documento INSTALL para
 tener su sistema reconfigurado para su situaci�n.
 La p�gina de manual de afterboot(8) tambi�n puede serle de ayuda.
 Como m�nimo, debe editar rc.conf para su entorno local, y cambiar
 rd_configure=NO a rc_configured=YES, o los reinicios se detendr�n
 en modo de usuario �nico.
+}
 message distmedium
 {Su disco est� ahora preparado para la instalaci�n el nucleo y los conjuntos
 de la distribuci�n.  Como se apunta en las notas INSTALL, tiene diversas
 opciones.  Para ftp o nfs, tiene que estar conectado a una red con acceso
 a las maquinas apropiadas.
 Conjuntos seleccionados: %d, procesados: %d. Siguiente conjunto: %s.
+}
 message distset
 {La distribuci�n NetBSD est� dividida en una colecci�n de conjuntos de
 distribuci�n.  Hay algunos conjuntos b�sicos que son necesarios para todas
 las instalaciones, y otros conjuntos que no son necesarios para todas las
 instalaciones.  Puede escoger para instalar s�lo los conjuntos esenciales
 (instalaci�n m�nima); instalar todos ellos (Instalaci�n completa) o
 seleccionar de entre los conjuntos de distribuci�n opcionales.
+}
 message ftpsource
 {Lo siguiente son el sitio %s, directorio, usuario y contrase�a que se
 usar�n.  Si �usuario� es �ftp�, no se necesita contrase�a..
+}
 message email
 {direcci�n de correo electr�nico}
 message dev
 {dispositivo}
 message nfssource
 {Introduzca el servidor nfs y el directorio del servidor donde se encuentre
 la distribuci�n.  Recuerde: el directorio debe contener los archivos .tgz y
 debe ser montable por nfs.
+}
 message floppysource
 {Introduzca el dispositivo de disquete a usar y el directorio destino de la
 transferencia en el sistema de archivos. Los archivos del conjunto han de estar
 en el directorio ra�z de los disquetes.
+}
 message cdromsource
 {Introduzca el dispositivo de CDROM a usar y el directorio del CDROM
 donde se encuentre la distribuci�n.
 Recuerde, el directorio debe contener los archivos .tgz.
+}
 message Available_cds
 {Available CDs}
 message ask_cd
 {Multiple CDs found, please select the one containing the install CD.}
 message cd_path_not_found
 {The installation sets have not been found at the default location on this
 CD. Please check device and path name.}
 message localfssource
 {Introduzca el dispositivo local desmontado y el directorio de ese
 dispositivo donde se encuentre la distribuci�n.
 Recuerde, el directorio debe contener los archivos .tgz.
+}
 message localdir
 {Introduzca el directorio local ya montado donde se encuentre la distribuci�n.
 Recuerde, el directorio debe contener los archivos .tgz.
+}
 message filesys
 {sistema de archivos}
 message nonet
 {No se ha podido encontrar ninguna interfaz de red para ser usada por NetBSD.
 Se le devolver� al men� anterior.
+}
 message netup
 {Las siguientes interfaces est�n activas: %s
 �Conecta alguna de ellas al servidor requerido?}
 message asknetdev
 {�Cu�l interfaces usar?}
 message netdevs
 {Interfaces disponibles}
 message netinfo
 {Para poder usar la red, necesita responder lo siguiente:
+}
 message net_domain
 {Su dominio DNS}
 message net_host
 {Su nombre de m�quina}
 message net_ip
 {Su n�mero IPv4}
 message net_srv_ip
 {N�mero servidor IPv4}
 message net_mask
 {M�scara de red IPv4}
 message net_namesrv
 {Servidor de nombres IPv4}
 message net_defroute
 {Pasarela IPv4}
 message net_media
 {Tipo de medio de la red}
 message netok
 {Ha introducido los siguientes valores.
 Dominio DNS: 		%s
 Nombre de m�quina:	%s
 Serv de nombres:	%s
 Interfaz primaria:	%s
 Tipo de medio:		%s
 IP de la m�quina:	%s
 M�scara de red:		%s
 Pasarela IPv4:		%s
+}
 message netok_slip
 {Ha introducido los siguientes valores. �Son correctos?
 Dominio DNS: 		%s
 Nombre de la m�quina:	%s
 Serv de nombres:	%s
 Interfaz primaria:	%s
 Tipo de medio:		%s
 IP de la m�quina:	%s
 IP del servidor:	%s
 M�scara de red:		%s
 Pasarela IPv4:		%s
+}
 message netokv6
 {IPv6 autoconf:		%s
+}
 message netok_ok
 {�Son correctos?}
 message wait_network
+{
 Espere mientras las interfaces de red se levantan.
+}
 message resolv
 {No se ha podido crear /etc/resolv.conf.  Instalaci�n interrumpida.
+}
 message realdir
 {No se ha podido cambiar el directorio a %s: %s.  Instalaci�n
 interrumpida.
+}
 message delete_xfer_file
 {A eliminar despu�s de la instalaci�n}
 message notarfile
 {El conjunto %s no existe.}
 message endtarok
 {Todos los conjuntos de distribuci�n han sido desempaquetados
 correctamente.}
 message endtar
 {Ha habido problemas al desempaquetar los conjuntos de la distribuci�n.
 Su instalaci�n est� incompleta.
 Ha seleccionado %d conjuntos de distribuci�n.  %d conjuntos no han sido
 encontrados, y %d han sido omitidos despu�s de que ocurriera un
 error.  De los %d que se han intentado, %d se han desempaquetado
 sin errores y %d con errores.
 La instalaci�n ha sido interrumpida.  Por favor, compruebe de nuevo su
 fuente de distribuci�n y considere el reinstalar los conjuntos desde
 el men� principal.}
 message abort
 {Sus opciones han hecho imposible instalar NetBSD.  Instalaci�n interrumpida.
+}
 message abortinst
 {La distribuci�n no ha sido cargada correctamente.  Necesitar� proceder
 a mano.  Instalaci�n interrumpida.
+}
 message abortupgr
 {La distribuci�n no ha sido correctamente cargada.  Necesitar� proceder
 a mano.  Instalaci�n interrumpida.
+}
 message abortunpack
 {El desempaquetamiento de los conjuntos adicionales no ha sido satisfactorio.
 Necesitar� proceder a mano, o escoger una fuente diferente para los conjuntos
 de esta distribuci�n y volver a intentarlo.
+}
 message createfstab
 {�Hay un gran problema!  No se puede crear /mnt/etc/fstab.  Desistiendo.
+}
 message noetcfstab
 {�Ayuda!  No hay /etc/fstab del disco objetivo %s.
 Interrumpiendo la actualizaci�n.
+}
 message badetcfstab
 {�Ayuda!  No se puede analizar /etc/fstab en el disco objetivo %s.
 Interrumpiendo la actualizaci�n.
+}
 message X_oldexists
 {No se puede guardar %s/bin/X como %s/bin/X.old, porque el
 disco objetivo ya tiene un %s/bin/X.old.  Por favor, arregle esto
 antes de continuar.
 Una manera es iniciando una shell desde el men� Utilidades, y examinar
 el objetivo %s/bin/X y %s/bin/X.old.  Si
 %s/bin/X.old es de una actualizaci�n completada, puede rm -f
 %s/bin/X.old y reiniciar.  O si %s/bin/X.old es de
 una actualizacion reciente e incompleta, puede rm -f %s/bin/X
 y mv %s/bin/X.old a %s/bin/X.
 Interrumpiendo la actualizaci�n.}
 message netnotup
 {Ha habido un problema configurando la red.  O su pasarela o su servidor
 de nombres no son alcanzables por un ping.  �Quiere configurar la red
 de nuevo?  (�No� le permite continuar de todos modos o interrumpir el
 proceso de instalaci�n.)
+}
 message netnotup_continueanyway
 {�Le gustar�a continuar el proceso de instalaci�n de todos modos, y
 suponer que la red est� funcionando?  (�No� interrumpe el proceso de
 instalaci�n.)
+}
 message makedev
 {Creando nodos de dispositivo ...
+}
 message badfs
 {Parece ser que /dev/%s%c no es un sistema de archivos BSD o bien el
 fsck ha fallado.  �Desea montarlo de todos modos?  (C�digo de error:
 %d.)
+}
 message rootmissing
 { el directorio ra�z objetivo no existe %s.
+}
 message badroot
 {El nuevo sistema de archivos ra�z no ha pasado la comprobaci�n b�sica.
  �Est� seguro de que ha instalado todos los conjuntos requeridos?
+}
 message fd_type
 {Tipo de sistema de archivos del disquete}
 message fdnotfound
 {No se ha encontrado el fichero en el disco.
+}
 message fdremount
 {El disquete no ha sido montado correctamente.
+}
 message fdmount
 {Por favor, inserte el disquete que contiene el fichero �%s.%s�.
 Si el conjunto no est� en m�s discos, seleccione "Conjunto finalizado"
 para instalarlo. Seleccione "Abortar lectura" para regresar al men�
 de selecci�n de medios de instalaci�n.
+}
 message mntnetconfig
 {La informaci�n de red que ha introducido, �es la adecuada para el
 funcionamiento normal de esta m�quina y desea instalarla en /etc? }
 message cur_distsets
 {�sta es la lista de conjuntos de distribuci�n que se usar�.
+}
 message cur_distsets_header
 {   Conjunto de distribuci�n Selecc.
    ------------------------ --------
+}
 message set_base
 {Base}
 message set_system
 {Sistema (/etc)}
 message set_compiler
 {Herramientas del compilador}
 message set_games
 {Juegos}
 message set_man_pages
 {Paginas de manual}
 message set_misc
 {Varios}
 message set_modules
 {Kernel Modules}
 message set_tests
 {Programas de prueba}
 message set_text_tools
 {Herramientas de procesamiento de textos}
 message set_X11
 {Conjuntos de X11}
 message set_X11_base
 {X11 base y clientes}
 message set_X11_etc
 {Configuraci�n de X11}
 message set_X11_fonts
 {Tipos de letra de X11}
 message set_X11_servers
 {Servidores X11}
 message set_X11_prog
 {Programaci�n de X11}
 message set_source
 {Source and debug sets}
 message set_syssrc
 {Kernel sources}
 message set_src
 {Base sources}
 message set_sharesrc
 {Share sources}
 message set_gnusrc
 {GNU sources}
 message set_xsrc
 {X11 sources}
 message set_debug
 {Debug symbols}
 message set_xdebug
 {X11 debug symbols}
 message cur_distsets_row
 {%-27s %3s}
 message select_all
 {Seleccionar todos los conjuntos anteriores}
 message select_none
 {No seleccionar ninguno de los conjuntos anteriores}
 message install_selected_sets
 {Instalar los conjuntos seleccionados}
 message tarerror
 {Ha habido un error al extraer el fichero %s.  Esto significa
 que algunos ficheros no han sido extraidos correctamente y su sistema
 no estar� completo.
 �Continuar extrayendo conjuntos?}
 message must_be_one_root
 {Debe haber una sola partici�n marcada para ser montada en �/�.}
 message partitions_overlap
 {las particiones %c y %c se solapan.}
 message No_Bootcode
 {No hay c�digo de arranque para la partici�n root}
 message cannot_ufs2_root
 {Sorry, the root file system can't be FFSv2 due to lack of bootloader support
 on this port.}
 message edit_partitions_again
+{
 Puede editar la tabla de particiones a mano, o dejarlo y retornar al
 men� principal.
 �Editar la tabla de particiones de nuevo?}
 message config_open_error
 {No se ha podido abrir el fichero de configuraci�n %s\n}
 message choose_timezone
 {Por favor, escoja de la siguiente lista la zona horaria que le convenga.
 Presione RETURN para seleccionar una entrada.
 Presione �x� seguido de RETURN para salir de la selecci�n de la
 zona horaria.
  Predefinida:	%s
  Seleccionada:	%s
  Hora local: 	%s %s
+}
 message tz_back
 { Volver a la lista principal de zonas horarias}
 message swapactive
 {El disco que ha seleccionado tiene una partici�n de intercambio (swap) que
 puede que est� en uso actualmente si su sistema tiene poca memoria.  Como
 se dispone a reparticionar este disco, esta partici�n swap ser� desactivada
 ahora.  Se advierte de que esto puede conducir a problemas de swap.
 Si obtuviera algun error, reinicie el sistema e int�ntelo de nuevo.}
 message swapdelfailed
 {Sysinst ha fallado en la desactivaci�n de la partici�n swap del disco que
 ha escogido para la instalaci�n.  Por favor, reinicie e int�ntelo de nuevo.}
 message rootpw
 {La contrase�a de root del nuevo sistema instalado no ha sido asignada todav�a,
 y por tanto est� vac�a.  �Quiere establecer ahora una contrase�a de root para
 el sistema?}
 message rootsh
 {Ahora puede seleccionar que shell quiere usar para el usuario root.  Por
 omisi�n es /bin/sh, pero podr�a preferir otra.}
 message no_root_fs
+{
 No hay un sistema de archivos ra�z definido.  Necesitar� al menos un punto
 de montaje con �/�.
 Presione <return> para continuar.
+}
 message slattach {
 Introduzca los par�metros de slattach
+}
 message Pick_an_option {Seleccione una opci�n para activar/desactivar.}
 message Scripting {Scripting}
 message Logging {Logging}
 message Status  { Estado: }
 message Command {Orden: }
 message Running {Ejecutando}
 message Finished {Acabado   }
 message Command_failed {Orden fallida}
 message Command_ended_on_signal {Orden terminada en se�al}
 message NetBSD_VERSION_Install_System {Sistema de instalaci�n de NetBSD-@@VERSION@@}
 message Exit_Install_System {Salir del sistema de instalaci�n}
 message Install_NetBSD_to_hard_disk {Instalar NetBSD en el disco duro}
 message Upgrade_NetBSD_on_a_hard_disk {Actualizar NetBSD en un disco duro}
 message Re_install_sets_or_install_additional_sets {Reinstalar conjuntos o instalar conjuntos adicionales}
 message Reboot_the_computer {Reiniciar la computadora}
 message Utility_menu {Men� de utilidades}
 message Config_menu {Menu de configuraci�n}
 message exit_menu_generic {atr�s}
 message exit_utility_menu {Exit}
 message NetBSD_VERSION_Utilities {Utilidades de NetBSD-@@VERSION@@}
 message Run_bin_sh {Ejecutar /bin/sh}
 message Set_timezone {Establecer la zona horaria}
 message Configure_network {Configurar la red}
 message Partition_a_disk {Particionar un disco}
 message Logging_functions {Funciones de registro}
 message Halt_the_system {Detener el sistema}
 message yes_or_no {�s� o no?}
 message Hit_enter_to_continue {Presione intro para continuar}
 message Choose_your_installation {Seleccione su instalaci�n}
 message Set_Sizes {Establecer los tama�os de las particiones NetBSD}
 message Use_Existing {Usar los tama�os de las particiones existentes}
 message Megabytes {Megabytes}
 message Cylinders {Cilindros}
 message Sectors {Sectores}
 message Select_medium {Seleccione el medio}
 message ftp {FTP}
 message http {HTTP}
 message nfs {NFS}
 .if HAVE_INSTALL_IMAGE
 message cdrom {CD-ROM / DVD / install image media}	/* XXX translation */
 .else
 message cdrom {CD-ROM / DVD}
 .endif
 message floppy {Disquete}
 message local_fs {Sistema de archivos desmontado}
 message local_dir {Directorio Local}
 message Select_your_distribution {Seleccione su distribuci�n}
 message Full_installation {Instalaci�n completa}
 message Full_installation_nox {Instalaci�n sin X11}
 message Minimal_installation {Instalaci�n m�nima}
 message Custom_installation {Instalaci�n personalizada}
 message hidden {** oculto **}
 message Host {M�quina}
 message Base_dir {Directorio base}
 message Set_dir_src {Directorio de conjuntos binary} /* fix XLAT */
 message Set_dir_bin {Directorio de conjuntos source} /* fix XLAT */
 message Xfer_dir {Directorio a transferir a}
 message User {Usuario}
 message Password {Contrase�a}
 message Proxy {Proxy}
 message Get_Distribution {Obtener la distribuci�n}
 message Continue {Continuar}
 message What_do_you_want_to_do {�Qu� desea hacer?}
 message Try_again {Reintentar}
 message Set_finished {Conjunto finalizado}
 message Skip_set {Omitir conjunto}
 message Skip_group {Omitir grupo de conjuntos}
 message Abandon {Abandonar instalaci�n}
 message Abort_fetch {Abortar lectura}
 message Device {Dispositivo}
 message File_system {Sistema de archivos}
 message Select_DNS_server {  Seleccione servidor DNS}
 message other {otro }
 message Perform_autoconfiguration {�Realizar autoconfiguraci�n ?}
 message Root_shell {Shell de root}
 message Color_scheme {Combinaci�n de colores}
 message White_on_black {Blanco sobre negro}
 message Black_on_white {Negro sobre blanco}
 message White_on_blue {Blanco sobre azul}
 message Green_on_black {Verde sobre negro}
 message User_shell {Shell de user}
 .if AOUT2ELF
 message aoutfail
 {No se ha podido crear el directorio al que deber�an moverse las bibliotecas
 compartidas a.out antiguas.  Por favor, intente el proceso de actualizaci�n
 de nuevo y aseg�rese de que ha montado todos los sistemas de ficheros.}
 message emulbackup
 {El directorio /emul/aout o /emul de su sistema era un enlace simb�lico que
 apuntaba a un sistema de archivos desmontado.  Se le ha dado la extension
 '.old'.  Cuando vuelva a arrancar su sistema actualizado, puede que necesite
 preocuparse de fundir el directorio /emul/aout nuevamente creado con el viejo.
+}
 .endif
 .if xxxx
 Si no est� preparado para completar la
 instalaci�n en este momento, puede seleccionar �ninguno� y ser� retornado
 al men� principal.  Cuando m�s adelante est� preparado, deber� seleccionar
 �actualizar� desde el men� principal para completar la instalaci�n.
 message cdrombadmount
 {No se ha podido montar el CDROM /dev/%s.}
 message localfsbadmount
 {No se ha podido montar %s en el dispositivo local %s.}
 .endif
 message oldsendmail
 {Sendmail ya no est� disponible en esta versi�n de NetBSD; el MTA por defecto
 es ahora postfix.  El fichero /etc/mailer.conf a�n est� configurado para usar
 el sendmail eliminado.  �Desea actualizar el fichero /etc/mailer.conf
 autom�ticamente para que apunte a postfix?  Si escoge "No" tendr� que
 actualizar /etc/mailer.conf usted mismo para asegurarse de que los mensajes
 de correo electr�nico se env�en correctamente.}
 message license
 {Para usar la interfaz de red %s, debe de aceptar la licencia en el archivo %s.
 Para ver este archivo ahora, pulse ^Z, mire el contendido del archivo, y luego
 teclee "fg" para continuar la instalaci�n.}
 message binpkg
 {Para configurar el sistema de paquetes bin�rios, por favor escoja el
 sitio de red desde el cual descargar los paquetes.  Una vez el sistema
 arranque, puede usar 'pkgin' para instalar paquetes adicionales, o
 eliminar paquetes ya instalados.}
 message pkgpath
 {Las siguientes entradas representan el protocolo, la m�quina, el
 directorio, el usuario y la contrase�a que se usar�n.  Si el "usuario"
 es "ftp", entonces la contrase�a es opcional.
+}
 message rcconf_backup_failed
 {Error al intentar hacer una c�pia de seguridad de rc.conf.  �Desea continuar?}
 message rcconf_backup_succeeded
 {La c�pia de seguridad de rc.conf se ha guardado en %s.}
 message rcconf_restore_failed
 {La recuperaci�n de rc.conf desde su c�pia de seguridad ha fallado.}
 message rcconf_delete_failed {La eliminaci�n del viejo %s ha fallado.}
 message Pkg_dir {Directorio del paquete}
 message configure_prior {configure a prior installation of}
 message configure {Configurar}
 message change {Cambiar}
 message password_set {Contrase�a configurada}
 message YES {SI}
 message NO {NO}
 message DONE {HECHO}
 message abandoned {Abandonado}
 message empty {***VAC�O***}
 message timezone {Zona horaria}
 message change_rootpw {Cambiar la contrase�a de root}
 message enable_binpkg {Activar la instalaci�n de paquetes binarios}
 message enable_sshd {Activar sshd}
 message enable_ntpd {Activar ntpd}
 message run_ntpdate {Ejecutar ntpdate durante el arranque}
 message enable_mdnsd {Activar mdnsd}
 message enable_xdm {Enable xdm}
 message enable_cgd {Enable cgd}
 message enable_lvm {Enable lvm}
 message enable_raid {Enable raidframe}
 message add_a_user {Add a user}
 message configmenu {Configurar elementos adicionales bajo demanda.}
 message doneconfig {Terminar configuraci�n}
 message Install_pkgin {Instalar pkgin y actualizar la lista de paquetes}
 message binpkg_installed
 {El sistema se ha configurado para usar pkgin para instalar paquetes
 binarios.  Para instalar un paquete, ejecute:
 pkgin install <nombre_del_paquete>
 desde una l�nea de comandos de root.  Lea la p�gina de manual pkgin(1)
 para m�s detalles.}
 message Install_pkgsrc {Descargar y desempaquetar pkgsrc}
 message pkgsrc
 {La instalaci�n de pkgsrc necesita desempaquetar un archivo descargado
 desde la red.
 Las siguientes entradas corresponden a la m�quina, directorio, usuario
 y contrase�a a usar para la conexi�n.  Si "usuario" es "ftp", entonces
 la contrase�a es opcional.
+}
 message Pkgsrc_dir {Directorio de pkgsrc}
 message get_pkgsrc
 {Descargar y desempaquetar pkgsrc para compilar desde c�digo fuente}
 message retry_pkgsrc_network
 {La configuraci�n de la red ha fallado.  �Reintentar?}
 message quit_pkgsrc {Salir sin instalar pkgsrc}
 message quit_pkgs_install {Salir sin instalar bin pkg}
 message pkgin_failed
 {La instalaci�n de pkgin ha fallado, posiblemente porque no existen
 paquetes binarios.  Por favor verifique el camino a los paquetes y
 reint�ntelo de nuevo.}
 message failed {Error}
 message notsupported {Operaci�n no admitida!}
 message askfsmountadv {Punto de montaje o 'raid' o 'CGD' o 'lvm'?}
 message partman {Partici�n extendida}
 message editbsdpart {Editar particiones BSD}
 message editmbr {Editar y guardar MBR}
 message switchgpt {Cambiar a GPT}
 message switchmbr {Cambiar a MBR}
 message renamedisk {Establece el nombre del disco}
 message fmtasraid {Formato como RAID}
 message fmtaslvm {Formato como LVM PV}
 message encrypt {Cifrar}
 message setbootable {La bandera de arranque}
 message erase {Borrado seguro}
 message undo {Deshacer los cambios}
 message unconfig {Desconfigurar}
 message edit {Editar}
 message doumount {Fuerza umount}
 message fillzeros {Llenar con ceros}
 message fillrandom {Llene los datos al azar}
 message fillcrypto {Rellene los datos de cifrado}
 message raid0 {0 - Sin paridad, creaci�n de bandas s�lo es simple.}
 message raid1 {1 - Creaci�n de reflejos. La paridad es el espejo.}
 message raid4 {4 - Striping con paridad almacenada en el �ltimo componente. component.}
 message raid5 {5 - Striping con paridad en los componentes de todos. components.}
 message fremove {QUITAR}
 message remove {Quitar}
 message add {A�adir}
 message auto {auto}
 message removepartswarn {Esta eliminar todas las particiones en el disco. �Desea continuar? want to continue?}
 message saveprompt {Guarde los cambios antes de terminar?}
 message cantsave {Los cambios no se pueden guardar.}
 message noroot {No hay una partici�n ra�z definida, no puede continuar \n}
 message wannaunblock {El dispositivo est� bloqueado. �Quiere forzar a desbloquear y continuar? unblock it and continue?}
 message wannatry {�Quieres probar?}
 message create_cgd {Crear cifrado de volumen (CGD)}
 message create_cnd {Crear imagen de disco virtual (VND)}
 message create_vg {Crear grupo de vol�menes (LVM VG)}
 message create_lv {      Crear vol�menes l�gicos}
 message create_raid {Crear RAID por software}
 message updpmlist {Actualizar lista de dispositivos}
 message savepm {Guardar los cambios}
 message pmblocked {BLOQUEADO}
 message pmunchanged {SIN USO}
 message pmsetboot {ARRANCAR}
 message pmused {UTILIZA}
 message pmmounted {(montado)}
 message pmunused {(sin usar)}
 message pmgptdisk {Disco con GPT}
 message finishpm {Finalizar el particionado}
 message limitcount {L�mite para el n�mero de dispositivos se lleg�!}
 message invaliddev {No v�lido dispositivo!}
 message avdisks {Discos disponibles:}
 message nofreedev {No se puede asignar nodo de dispositivo!}
 message partman_header
 {Partition Manager. Todos los discos, particiones y etc muestra all�.
 Al principio, las particiones MBR hacen, a continuaci�n, hacer etiquetas BSD.
 Si desea utilizar RAID, LVM o CGD, siga estos pasos:
 ) Crear particiones BSD con el tipo necesario;
 ) Crear RAID / LVM VG / CGD el uso de estas particiones; 3) Gu�rdalo;
 ) Crear particiones de vol�menes RAID / CGD o l�gico de LVM.}
 message raid_menufmt {   raid%d (nivel %1d) en %-34s %11uM}
 message raid_err_menufmt {   RAID VACIO!}
 message raid_disks_fmt {Discos: %32s}
 message raid_spares_fmt {Piezas de recambio: %20s}
 message raid_level_fmt {RAID de nivel:    %22d}
 message raid_numrow_fmt {numRow:           %22d}
 message raid_numcol_fmt {numCol:           %22d}
 message raid_numspare_fmt {numSpare:         %22d}
 message raid_sectpersu_fmt {sectPerSU:        %22d}
 message raid_superpar_fmt {SUsPerParityUnit: %22d}
 message raid_superrec_fmt {SUsPerReconUnit:  %22d}
 message raid_nomultidim {Matrices multidimensionales no son compatibles!}
 message raid_numrow_ask {numRow?}
 message raid_numcol_ask {numCol?}
 message raid_numspare_ask {numSpare?}
 message raid_sectpersu_ask {sectPerSU?}
 message raid_superpar_ask {SUsPerParityUnit?}
 message raid_superrec_ask {SUsPerReconUnit?}
 message raid_disks {Los discos en RAID:}
 message vnd_err_menufmt {   CAMINO NO DEFINIDO!}
 message vnd_assgn_menufmt {   vnd%1d en %-51s ASSIGN}
 message vnd_menufmt {   vnd%1d en %-45s %11uM}
 message vnd_path_fmt {Ruta del archivo: %22s}
 message vnd_assgn_fmt {Create new image: %14s}
 message vnd_size_fmt {Tama�o:          %22sM}
 message vnd_ro_fmt {S�lo lectura:     %22s}
 message vnd_geom_fmt {Establecer la geometr�a de la mano: %4s}
 message vnd_bps_fmt {Bytes por sector:     %18s}
 message vnd_spt_fmt {Sectores por pista:   %18s}
 message vnd_tpc_fmt {Pistas por cilindro:  %18s}
 message vnd_cyl_fmt {Cilindros:        %22s}
 message vnd_path_ask {Ruta de acceso?}
 message vnd_size_ask {Tama�o (MB)?}
 message vnd_bps_ask {Bytes por sector?}
 message vnd_spt_ask {Sectores por pista?}
 message vnd_tpc_ask {Pistas por cilindro?}
 message vnd_cyl_ask {Cilindros}
 message cgd_err_menufmt {   DISCO NO SE DEFINE!}
 message cgd_menufmt {   cgd%1d %-48s %11uM}
 message cgd_dev_fmt {Dispositivo de base: %19s}
 message cgd_enc_fmt {Encriptaci�n:        %19s}
 message cgd_key_fmt {Tama�o de la clave:  %19d}
 message cgd_iv_fmt {Algoritmo IV:        %19s}
 message cgd_keygen_fmt {La generaci�n de claves: %15s}
 message cgd_verif_fmt {M�todo de verificaci�n:  %15s}
 message lvm_disks {Discos en VG:}
 message lvm_menufmt {   %-44s %20sM}
 message lvm_err_menufmt {   VACIAR VG!}
 message lvm_disks_fmt {PV's: %34s}
 message lvm_name_fmt {Nombre: %32s}
 message lvm_maxlv_fmt {MaxLogicalVolumes:  %20s}
 message lvm_maxpv_fmt {MaxPhysicalVolumes: %20s}
 message lvm_extsiz_fmt {PhysicalExtentSize: %20s}
 message lvm_name_ask {Nombre?}
 message lvm_maxlv_ask {MaxLogicalVolumes?}
 message lvm_maxpv_ask {MaxPhysicalVolumes?}
 message lvm_extsiz_ask {PhysicalExtentSize (MB)?}
 message lvmlv_menufmt {      El volumen l�gico %-33s% 11uM}
 message lvmlv_name_fmt {Nombre: %32s}
 message lvmlv_size_fmt {Tama�o: %31dM}
 message lvmlv_ro_fmt {S�lo lectura:  %25s}
 message lvmlv_cont_fmt {Contigua:      %25s}
 message lvmlv_extnum_fmt {LogicalExtentsNumber: %18s}
 message lvmlv_minor_fmt {Menor n�mero:  %25s}
 message lvmlv_mirrors_fmt {Espejos:       %25d}
 message lvmlv_regsiz_fmt {MirrorLogRegionSize:  %18s}
 message lvmlv_pers_fmt {N�mero de persistente menor: %11s}
 message lvmlv_readahsect_fmt {ReadAheadSectors:     %18s}
 message lvmlv_stripes_fmt {Rayas:         %25s}
 message lvmlv_stripesiz_fmt {Stripesize:    %25s}
 message lvmlv_zero_fmt {Puesta a cero de la primera KB: %8s}
 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,1302 +1,1312 @@
-/*	$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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of Piermont Information Systems Inc. may not be used to endorse
  *    or promote products derived from this software without specific prior
  *    written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``AS IS''
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PIERMONT INFORMATION SYSTEMS INC. BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 /* MI Message catalog -- french, machine independent */
 message usage
 {utilisation: sysinst [-D] [-f fichier_de_d�finition] [-r version] [-C bg:fg]
+}
 /*
  * We can not use non ascii characters in this message - it is displayed
  * before the locale is set up!
  */
 message sysinst_message_language
 {Messages d'installation en fran�ais}
 message sysinst_message_locale
 {fr_FR.ISO8859-15}
 message Yes {Oui}
 message No {Non}
 message All {Tous}
 message Some {Une partie}
 message None {Aucun}
 message none {aucun}
 message OK {OK}
 message ok {ok}
 message unchanged {non-modifi�}
 message On {On}
 message Off {Off}
 message Delete {Supprimer ?}
 message install
 {installer}
 message reinstall
 {r�installer des composants de}
 message upgrade
 {mise � jour}
 message hello
 {Bienvenue dans Sysinst, l'outil d'installation de NetBSD-@@VERSION@@.
 Cet utilitaire a �t� con�u pour vous aider � installer ou mettre � jour
 NetBSD sur votre disque dur avec un minimum de travail.
 Dans les menus suivants, vous pourrez changer de s�lection, soit en tapant la
 lettre en r�f�rence (a, b, c, d, ...) soit en utilisant les touches
 fl�ches du clavier.
 La s�lection courante est activ�e en appuyant sur la touche Entr�e.
+}
 message thanks
 {Merci d'utiliser NetBSD !
+}
 message installusure
 {Vous avez choisi d'installer NetBSD sur votre disque dur. Ceci va changer les
 informations contenues sur ce dernier. Vous devriez faire une sauvegarde
 compl�te de son contenu avant de poursuivre cette installation. Cette
 proc�dure va effectuer les actions suivantes :
 	a) Partitionner votre disque dur.
 	b) Cr�er de nouveaux syst�mes de fichiers BSD.
 	c) Installer les diff�rents composants.
 (Une fois le partitionnement configur�, le syst�me d'installation vous
 demandera de confirmer avant d'appliquer toute modification sur votre
 disque dur.)
 Souhaitez-vous continuer ?
+}
 message upgradeusure
 {Mise � jour de NetBSD sur votre disque dur.
 Cela implique des modifications aux informations contenues
 sur votre disque dur.
 Vous devriez faire une sauvegarde compl�te de celui-ci avant de
 continuer la proc�dure de mise � jour.
 Voulez-vous vraiment mettre � jour NetBSD ?
 (Ceci est le dernier avertissement avant que cette
 proc�dure ne modifie votre disque.)
+}
 message reinstallusure
 {Les composants de NetBSD seront maintenant decompress�s sur un disque dur
 d�marrable. Cette proc�dure va rapatrier et d�compresser les composants
 sur un disque d�marrable d�j� partitionnn�. Elle n'inscrit pas de "label" sur
 le disque, n'installe pas de nouveaux secteurs d'amor�age et ne modifie
 pas les fichiers de configuration existants. (Quittez et choisissez `installer'
 ou `mettre � jour' si vous d�sirez ces options.)
 Vous devriez d�j� avoir fait une installation ou une mise � jour avant de
 d�marrer cette proc�dure !
 Voulez-vous r�ellement r�installer les composants NetBSD ?
 (Ceci est le dernier avertissement avant que cette proc�dure ne commence �
 modifier vos disques.)
+}
 message mount_failed
 {Le montage du syst�me de fichiers %s a �chou�.  Continuer ?
+}
 message nodisk
 {Aucun disque utilisable par NetBSD n'a �t� trouv�.
 Retour au menu pr�c�dent.
+}
 message onedisk
 {Un seul disque a �t� trouv� : %s. Nous supposons que vous souhaitez
 %s NetBSD sur ce dernier.
+}
 message ask_disk
 {Sur quel disque voulez-vous %s NetBSD ?}
 message Available_disks
 {Disques disponibles :}
 message heads
 {t�tes}
 message sectors
 {secteurs}
 message fs_isize
 {taille moyenne de fichier (octets)}
 message mountpoint
 {point de montage (ou 'aucun')}
 message cylname
 {cyl}
 message secname
 {sec}
 message megname
 {Mo}
 message layout
 {NetBSD utilise un "disklabel" BSD pour diviser la portion du disque r�serv�e �
 NetBSD en plusieurs partitions. Vous devez param�trer ce dernier.
 Vous pouvez utiliser un �diteur afin de pr�ciser la taille des partitions
 NetBSD, ou pr�server la taille et le contenu des partitions existantes.
 Vous aurez ensuite la possibilit� d'�diter les champs du disklabel.
 La taille allou�e pour NetBSD sur votre disque est de %d Mo.
 L'installation standard requiert au moins %d Mo.
 L'installation standard avec X requiert au moins %d Mo.
+}
 message Choose_your_size_specifier
 {Si vous choisissez "M�gaoctets", la taille sera le plus proche de votre
 choix possible, arrondi au cylindre-pr�s.
 Si vous choisissez "Secteurs", vous pourrez choisir pr�cis�ment
 les tailles.
 Sur les disques modernes, la taille r�elle des cylindres est variable
 et il y a peu d'int�r�t � aligner les partitions sur les cylindres.
 Pour les disques plus anciens, il est recommand� de choisir des tailles
 de partitions arrondies au cylindre-pr�s, pour plus de performance.
 Choisissez l'unit� d'espace disque d�sir�e}
 message ptnsizes
 {Vous pouvez d�sormais modifier la taille des partitions syst�me.
 Par d�faut, tout l'espace sera allou� � la partition racine principale,
 mais vous pouvez sous-diviser celle-ci en plusieurs
 syst�mes de fichiers. Exemples : /usr (fichiers syst�me additionnels),
 /var (fichiers des journaux, etc.)
 et /home (regroupant les r�pertoires utilisateurs).
 L'espace libre restant sera ajout� � la partition marqu�e par un '+'.
+}
 message ptnheaders
+{
        Mo         Cylindres  Secteurs   Syst�me de fichiers
+}
 message askfsmount
 {Point de montage ?}
 message askfssize
 {Taille pour %s en %s ?}
 message askunits
 {Changer d'unit� (secteurs/cylindres/Mo)}
 message NetBSD_partition_cant_change
 {Partition de NetBSD}
 message Whole_disk_cant_change
 {Totalit� du disque}
 message Boot_partition_cant_change
 {Partition de d�marrage}
 message add_another_ptn
 {Ajouter manuellement une nouvelle partition}
 message fssizesok
 {Taille de la partition accept�e. Libre : %d %s et %d partitions}
 message fssizesbad
 {R�duire la taille de la partition de %d %s (%u secteurs).}
 message startoutsidedisk
 {La valeur que vous avez sp�cifi�e d�passe les limites du disque.
+}
 message endoutsidedisk
 {Avec cette valeur, la fin de la partition exc�de la limite du disque.
 La taille de la partition a �t� tronqu�e � %d %s.
+}
 message toobigdisklabel
+{
 Ce disque est trop grand pour qu'une table de partition soit utilis�e.
 Il ne peut donc pas �tre utilis� en tant que disque d�marrable ou
 contenir la partition racine.
 Il pourra cependant �tre utilis� sous NetBSD s'il est manuellement
 partitionn� utilisant l'outil GPT(8).
+}
 message fspart
 {Vos partitions NetBSD sont les suivantes :
+}
 message fspart_header
 {   D�but %3s   Fin %3s Taille %3s Type       Newfs Mount Point de montage
    --------- --------- ---------- ---------- ----- ----- ----------------
+}
 message fspart_row
 {%9lu %9lu %10lu %-10s %-5s %-5s %s}
 message show_all_unused_partitions
 {Afficher les partitions libres}
 message partition_sizes_ok
 {Taille et options des partitions valides}
 message edfspart
 {Vous devez d'abord pr�ciser le type de syst�me de fichiers (FS),
 puis les autres valeurs.
 Les valeurs actuelles pour la partition %c sont :
                           Mo cylindres  secteurs
                      ------- --------- ---------
+}
 message fstype_fmt
 { type de syst�me de fichiers : %9s}
 message start_fmt
 {                      d�but : %9u %8u%c %9u}
 message size_fmt
 {                     taille : %9u %8u%c %9u}
 message end_fmt
 {                        fin : %9u %8u%c %9u}
 message bsize_fmt
 {             taille de bloc : %9d bytes}
 message fsize_fmt
 {         taille de fragment : %9d bytes}
 message isize_fmt
 {  taille moyenne de fichier : %9d bytes}
 message isize_fmt_dflt
 {  taille moyenne de fichier : 4 fragments}
 message newfs_fmt
 {                  formatage : %9s}
 message mount_fmt
 {                    montage : %9s}
 message mount_options_fmt
 {         options de montage : }
 message mountpt_fmt
 {              Pt de montage : %9s}
 message toggle
 {Basculer}
 message restore
 {Restaurer les valeurs initiales}
 message Select_the_type
 {S�lection du type de syst�me de fichiers}
 message other_types
 {autres types}
 message label_size
 {%s
 Valeurs sp�ciales pouvant �tre utilis�es pour d�finir la taille de la partition :
     -1 : Utiliser jusqu'� la fin de la partie NetBSD du disque
    a-%c : Terminer cette partition o� la partition X d�bute
 taille (%s)}
 message label_offset
 {%s
 Valeurs sp�ciales pouvant �tre utilis�es pour d�finir le d�but de la partition :
     -1 : Commencer au d�but de la partie NetBSD du disque
    a-%c : Commencer � la suite de la partition pr�c�dente (a ... %c)
 d�but (%s)}
 message invalid_sector_number
 {nombre de secteurs invalide
+}
 message Select_file_system_block_size
 {S�lectionnez la taille de bloc du syst�me de fichiers}
 message Select_file_system_fragment_size
 {S�lectionnez la taille de fragment du syst�me de fichiers}
 message packname
 {Veuillez donner un nom � votre disque.}
 message lastchance
 {Nous sommes pr�ts � installer NetBSD sur votre disque (%s).
 Aucune modification n'a �t� effectu�e pour l'instant.
 Ceci est votre derni�re opportunit� pour quitter cette
 proc�dure en laissant votre disque intact.
 Souhaitez-vous vraiment continuer ?
+}
 message disksetupdone
 {La premi�re partie de la proc�dure est termin�e.
 Sysinst a �crit vos nouvelles partitions sur votre disque,
 puis a proc�d� � la v�rification de leur int�grit� (via fsck).
+}
 message disksetupdoneupdate
 {La premi�re partie de la proc�dure est termin�e.
 Sysinst a �crit vos nouvelles partitions sur votre disque,
 puis a proc�d� � la v�rification de leur int�grit� (via fsck).
+}
 message openfail
 {Impossible d'ouvrir %s. Message d'erreur obtenu : %s.
+}
 message mountfail
 {Le montage de /dev/%s%c sur %s a �chou�.
+}
 message extractcomplete
 {L'extraction des composants s�lectionn�s de NetBSD-@@VERSION@@
 est compl�te.
 Le syst�me peut d�sormais d�marrer directement depuis le disque.
 Pour compl�ter l'installation, Sysinst va maintenant vous
 permettre d'effectuer quelques r�glages essentiels.
+}
 message instcomplete
 {L'installation de NetBSD-@@VERSION@@ est termin�e. L'ordinateur va
 red�marrer depuis le disque dur. Veuillez consulter le document
 d'installation (INSTALL) pour apprendre � bien configurer votre
 syst�me.
 Nous vous recommandons au minimum de configurer le mot de passe
 du compte root et de param�trer /etc/rc.conf selon vos besoins.
 Consultez les manuels rc.conf(5), afterboot(8) et security(7)
 au besoin.
+}
 message unpackcomplete
 {La mise � jour de NetBSD-@@VERSION@@ est termin�e.
 Veuillez consulter le document d'installation (INSTALL) pour apprendre
 � bien configurer votre syst�me.
 Vous devez �diter /etc/rc.conf et ajouter la ligne
 "RC_CONFIGURED=yes" pour red�marrer en mode multi-utilisateur.
+}
 message upgrcomplete
 {L'installation des composants suppl�mentaires de NetBSD-@@VERSION@@ est
 termin�e.
 Veuillez consulter le document d'installation (INSTALL) pour apprendre
 � bien configurer votre syst�me.
 Vous devez �diter /etc/rc.conf et ajouter la ligne
 "RC_CONFIGURED=yes" pour red�marrer en mode multi-utilisateur.
+}
 message distmedium
 {Votre disque est maintenant pr�t � recevoir le coeur du syst�me
 et ses diff�rents composants annexes. Comme indiqu� dans le document
 d'installation, vous avez plusieurs possibilit�s. Pour une installation via
 NFS ou FTP, vous devez �tre connect� � un r�seau et avoir acc�s au serveur
 requis.
 Composant s�lectionn� : %d, trait� : %d. Prochain composant : %s.
+}
 message distset
 {La distribution de NetBSD est divis�e en plusieurs composants.
 Certains sont indispensables.
 Trois types d'installations vous sont propos�s : compl�te, minimale ou
 personnalis�e.
+}
 message ftpsource
 {Voici la configuration actuelle pour : nom du site (%s), r�pertoire, nom
 d'utilisateur et mot de passe.
 Si vous utilisez le mode FTP, le mot de passe n'est pas requis.
 Le r�pertoire contenant les composants doit �tre d�fini par
 rapport au r�pertoire de base, et contenir chaque composant sous
 la forme de fichiers .tgz
+}
 message email
 {adresse de courriel}
 message dev
 {p�riph�rique}
 message nfssource
 {Veuillez indiquer le nom du serveur NFS ainsi que le r�pertoire contenant
 les fichiers d'installation.
 Ce r�pertoire doit �tre export� via NFS, et contenir ces fichiers
 � sa racine m�me.
+}
 message floppysource
 {Veuillez sp�cifier le nom du lecteur de disquette � utiliser.
 Les fichiers d'installation devront se trouver � la racine
 de chaque disquette.
+}
 message cdromsource
 {Veuillez sp�cifier le nom du lecteur CD-ROM � utiliser,
 ainsi que le nom du r�pertoire contenant les fichiers d'installation.
 Ils doivent �tre plac�s � sa racine, sous la forme de fichiers
 tgz.
+}
 message Available_cds
 {CD-ROM disponibles}
 message ask_cd
 {Plusieurs CD-ROM ont �t� trouv�s.  S�lectionnez celui contenant le syst�me
 d'installation de NetBSD.}
 message cd_path_not_found
 {Les archives d'installation ne peuvent �tre trouv�es � l'emplacement sp�cifi�
 sur ce CD-ROM.  Assurez-vous que le p�riph�rique et le chemin sont les bons.}
 message localfssource
 {Veuillez sp�cifier le nom du p�riph�rique local (qui ne doit pas
 �tre mont�) � utiliser. Ce dernier doit contenir les fichiers
 d'installation � sa racine, sous la forme de fichiers tgz.
+}
 message localdir
 {Veuillez sp�cificer le nom du r�pertoire local (d�j� mont�)
 o� se trouvent les fichiers d'installation. Ils doivent se trouver
 � la racine du r�pertoire, sous la forme de fichiers tgz.
+}
 message filesys
 {syst�me de fichiers}
 message nonet
 {Aucune interface r�seau utilisable n'a �t� trouv�e.
 Retour au menu pr�c�dent.
+}
 message netup
 {Les interfaces r�seau suivantes sont utilisables : %s
 Quelle interface souhaitez-vous utiliser ?
+}
 message asknetdev
 {Quelle interface doit �tre utilis�e ?}
 message netdevs
 {Interfaces disponibles}
 message netinfo
 {Veuillez r�pondre aux points suivants afin de pouvoir utiliser
 votre interface r�seau :
+}
 message net_domain
 {Votre nom de domaine}
 message net_host
 {Votre nom d'ordinateur}
 message net_ip
 {Votre adresse IPv4}
 message net_srv_ip
 {Adresse IPv4 du serveur}
 message net_mask
 {Votre masque de r�seau (IPv4)}
 message net_namesrv
 {Adresse IPv4 de votre serveur de noms (DNS)}
 message net_defroute
 {Adresse IPv4 de votre passerelle}
 message net_media
 {Type de r�seau (m�dia)}
 message netok
 {Vous avez sp�cifi� les valeurs suivantes :
 Nom de domaine (DNS) :		%s
 Nom d'ordinateur :		%s
 Adresse du serveur de noms :	%s
 Interface r�seau :		%s
 Type de r�seau (m�dia)		%s
 Adresse IPv4 :			%s
 Masque de sous-r�seau :		%s
 Adresse IPv4 de la passerelle : %s
+}
 message netok_slip
 {Vous avez sp�cifi� les valeurs suivantes. �tes-vous d'accord ?
 Nom de domaine (DNS) :		%s
 Nom d'ordinateur :		%s
 Adresse du serveur de noms :	%s
 Interface r�seau :		%s
 Type de r�seau (m�dia) :	%s
 Adresse IPv4 :			%s
 Adresse IPv4 du serveur :	%s
 Masque de sous-r�seau :		%s
 Adresse IPv4 de la passerelle :	%s
+}
 message netokv6
 {Auto-configuration IPv6 :	%s
+}
 message netok_ok
 {Les valeurs sont-elles correctes ?}
 message slattach {
 Entrez les "flags" slattach
+}
 message wait_network
+{
 Veuillez patienter pendant la configuration de l'interface...
+}
 message resolv
+{
 Impossible de cr�er le fichier /etc/resolv.conf
 �chec de l'installation.
+}
 message realdir
+{
 Impossible de d�placer le r�pertoire %s/%s
 �chec de l'installation.
+}
 message delete_xfer_file
+{
 Effacer apr�s l'installation
+}
 message notarfile
 {Le composant %s n'existe pas.}
 message endtarok
+{
 Tous les composants sont install�s. Veuillez appuyer sur la touche
 Entr�e pour continuer.
+}
 message endtar
+{
 L'installation des composants est termin�e. Toutefois, un ou plusieurs
 probl�mes sont survenus au cours de leur extraction.
 Vous avez s�lectionn� %d composants. %d n'ont pu �tre install�s,
 et %d ont �t� ignor�s � la suite d'erreurs.
 Sur les %d composants trait�s, %d ont pu �tre install�s et
 %d ont provoqu� une erreur.
 Veuillez v�rifier l'int�grit� des fichiers d'installation et leur
 emplacement, puis essayez � nouveau via une r�installation de composants,
 depuis le menu principal.
+}
 message abort
+{
 Votre s�lection ne permet pas l'installation de NetBSD.
 Annulation de l'installation.
+}
 message abortinst
+{
 L'instalation des composants de NetBSD n'est pas compl�te.
 Vous allez devoir recommencer, ou terminer � la main.
 �chec de l'installation.
+}
 message abortupgr
+{
 La mise � jour des composants de NetBSD n'est pas compl�te.
 Vous allez devoir recommencer, ou terminer � la main.
 �chec de l'installation.
+}
 message abortunpack
+{
 L'installation des composants suppl�mentaires n'est pas compl�te.
 Vous allez devoir recommencer, ou terminer � la main.
 Essayez de choisir une source diff�rente pour les fichiers
 d'installation.
+}
 message createfstab
+{
 Impossible de cr�er /mnt/etc/fstab
 Ceci est une erreur majeure : nous ne pouvons continuer.
 �chec de l'installation.
+}
 message noetcfstab
+{
 Le fichier /etc/fstab n'est pas pr�sent sur le disque cible %s
 Ceci est une erreur majeure : nous ne pouvons continuer.
 �chec de l'installation.
+}
 message badetcfstab
+{
 Impossible de lire le contenu du fichier /etc/fstab pr�sent sur
 le disque cible %s
 Ceci est une erreur majeure : nous ne pouvons continuer.
 �chec de l'installation.
+}
 message X_oldexists
+{
 Impossible de sauvegarder %s/bin/X : le disque contient d�j�
 un fichier %s/bin/X.old et nous devons renommer le fichier actuel
 � ce nom. Veuillez supprimer ou renommer le fichier X.old avant de
 recommencer.
 Vous pouvez d�marrer un shell depuis le menu "Utilitaires" afin
 de faire cette modification.
 Ce fichier provient probablement d'une ancienne mise � jour et
 il est possible de le supprimer. S'il provient d'une mise � jour
 incompl�te, vous pouvez effacer %s/bin/X et renommer
 %s/bin/X.old jusqu'� %s/bin/X.%0s%0s%0s%0s%0s%0s
 Arr�t de la mise � jour.
+}
 message netnotup
+{
 Un probl�me est survenu lors de la configuration de votre interface
 r�seau. Votre serveur de noms ou votre passerelle ne semblent pas
 r�pondre aux pings.
 Souhaitez-vous configurer � nouveau les param�tres de votre
 connexion r�seau ?
 (un refus provoquera l'arr�t de la proc�dure d'installation)
+}
 message netnotup_continueanyway
+{
 Souhaitez-vous poursuivre malgr� tout le processus d'installation
 et supposer que le r�seau fonctionne correctement ?
 (un refus provoquera l'arr�t de la proc�dure d'installation)
+}
 message makedev
 {Cr�ation des fichiers des p�riph�riques ...
+}
 message badfs
+{
 /dev/%s%c ne semble pas �tre un syst�me de fichiers BSD, ou
 la v�rification de son int�grit� par fsck a �chou�, code d'erreur %d.
 Souhaitez-vous continuer mise � jour?
+}
 message rootmissing
+{
 Impossible de trouver la racine du disque cible %s.
+}
 message badroot
+{
 La v�rification de l'int�grit� du nouveau syst�me de fichiers a �chou�.
 Avez-vous bien install� tous les composants indispensables ?
+}
 message fd_type
 {Syst�me de fichiers de la disquette}
 message fdnotfound
+{
 Impossible de trouver un fichier requis sur la disquette.
+}
 message fdremount
+{
 Impossible de monter la disquette correctement.
+}
 message fdmount
+{
 Veuillez ins�rer la disquette contenant le fichier "%s.%s".
 Si le jeu de disquettes ne comprend aucun autre disque, veuillez
 choisir "Ensemble termin�" pour mettre un terme � ce traitement.
 S�lectionnez "Annuler la r�cup�ration" pour revenir au menu
 de s�lection du m�dia d'installation.
+}
 message mntnetconfig
 {Souhaitez-vous conserver les r�glages r�seaux apr�s le red�marrage
 du syst�me que nous venons d'installer ? }
 message cur_distsets
+{
 S�lectionnez les composants dans la liste ci-dessous :
+}
 message cur_distsets_header
 {      Composant                      Installer?
 ------------------------------------ ----------
+}
 message set_base
 {Base}
 message set_system
 {Syst�me (/etc)}
 message set_compiler
 {Outils de d�veloppement}
 message set_games
 {Jeux}
 message set_man_pages
 {Pages de manuel}
 message set_misc
 {Divers}
 message set_modules
 {Modules du noyau}
 message set_tests
 {Programmes de test}
 message set_text_tools
 {Outils de manipulation de texte}
 message set_X11
 {X11}
 message set_X11_base
 {X11 base et clients}
 message set_X11_etc
 {X11 configuration}
 message set_X11_fonts
 {X11 polices}
 message set_X11_servers
 {X11 serveurs}
 message set_X11_prog
 {X11 d�veloppement}
 message set_source
 {Code source et d�bogage}
 message set_syssrc
 {Sources du noyeau}
 message set_src
 {Sources de la Base}
 message set_sharesrc
 {Sources de partage (Share)}
 message set_gnusrc
 {Sources des composants GNU}
 message set_xsrc
 {Sources X11}
 message set_debug
 {Symboles de d�bogage}
 message set_xdebug
 {Symboles de d�bogage X11}
 message cur_distsets_row
 {%-33s %3s}
 message select_all
 {S�lectionner tous les composants}
 message select_none
 {D�selectionner tous les composants}
 message install_selected_sets
 {Installer les composants s�lectionn�s}
 message tarerror
+{
 Une erreur est survenue lors de l'installation du fichier %s.
 Certains fichiers n'ayant pu �tre extraits correctement,
 le syst�me n'est pas complet et pourrait ne pas fonctionner
 correctement.
 Souhaitez-vous continuer l'installation des composants ?
+}
 message must_be_one_root
+{
 Une seule partition peut �tre mont�e en tant que racine, dite "/".
+}
 message partitions_overlap
 {Les partitions %c et %c s'empi�tent l'une sur l'autre.}
 message No_Bootcode
 {Pas de programme de d�marrage trouv� sur la partition racine}
 message cannot_ufs2_root
 {Le syst�me de fichiers de la partition racine ne peut pas �tre FFSv2 car le
 chargeur de d�marrage ne le supporte pas.}
 message edit_partitions_again
+{
 Vous pouvez �diter la table de partitions � la main, ou abandonner et
 retourner au menu principal.
 Souhaitez-vous �diter � nouveau la table de partitions ?
+}
 message config_open_error
+{
 Impossible d'ouvrir le fichier de configuration %s.\n
+}
 message choose_timezone
+{
 Veuillez s�lectionner votre zone horaire dans la liste suivante.
 Appuyez sur la touche Entr�e pour confirmer votre choix.
 Appuyez sur "x" puis sur Entr�e pour valider la s�lection en cours.
  Par d�faut :		%s
  S�lection actuelle : %s
  Heure locale :		%s %s
+}
 message tz_back
 { Retour � la liste principale des fuseaux horaires}
 message swapactive
+{
 Le disque s�lectionn� dispose d'une partition d'�change (swap) qui
 est peut-�tre en cours d'utilisation, en particulier si votre syst�me
 dispose de peu de m�moire.
 Le repartitionnement de votre disque requiert la d�sactivation de cette
 partition. Prenez garde ! Cette op�ration peut entra�ner des erreurs.
 Si cela survient, vous devrez alors red�marrer et tenter � nouveau.
+}
 message swapdelfailed
+{
 Sysinst n'a pas pu d�sactiver la partition d'�change (swap) pr�sente
 sur le disque cible pour l'installation. Vous devez red�marrer et tenter
 � nouveau.
+}
 message rootpw
+{
 Aucun mot de passe pour le compte "root" n'a �t� d�fini.
 Nous vous recommandons de sp�cifier un mot de passe maintenant.
 Le souhaitez-vous ?
+}
 message rootsh
+{
 Sp�cifiez le shell par d�faut qui sera utilis� par l'utilisateur "root".
 Par d�faut, il s'agit de /bin/sh
+}
 message no_root_fs
+{
 Aucune partition racine n'est actuellement d�finie. Vous devez au moins
 d�finir le point de montage de cette partition racine, dite "/".
 Appuyez sur la touche Entr�e pour continuer.
+}
 message Pick_an_option {Choisissez une option � activer/d�sactiver}
 message Scripting {Scripting}
 message Logging {Journal}
 message Status  {Statut : }
 message Command {Commande : }
 message Running {En cours d'ex�cution}
 message Finished {Termin�e}
 message Command_failed {�chec}
 message Command_ended_on_signal {Commande termin�e par un signal}
 message NetBSD_VERSION_Install_System {NetBSD-@@VERSION@@ Programme d'installation}
 message Exit_Install_System {Quitter le programme d'installation}
 message Install_NetBSD_to_hard_disk {Installation de NetBSD sur disque dur}
 message Upgrade_NetBSD_on_a_hard_disk {Mise � jour de NetBSD sur disque dur}
 message Re_install_sets_or_install_additional_sets {R�installer ou installer de nouveaux composants}
 message Reboot_the_computer {Red�marrer l'ordinateur}
 message Utility_menu {Utilitaires}
 message Config_menu {Configuration}
 message exit_menu_generic {Quitter}
 message exit_utility_menu {Quitter}
 message NetBSD_VERSION_Utilities {Utilitaires NetBSD-@@VERSION@@}
 message Run_bin_sh {Ex�cuter /bin/sh}
 message Set_timezone {Configurer le fuseau horaire}
 message Configure_network {Configurer le r�seau}
 message Partition_a_disk {Partitionner un disque}
 message Logging_functions {Journaux}
 message Halt_the_system {Arr�ter le syst�me}
 message yes_or_no {oui ou non?}
 message Hit_enter_to_continue {Appuyez sur la touche Entr�e pour continuer}
 message Choose_your_installation {Choisir le type d'installation d�sir�}
 message Set_Sizes {Sp�cifier les tailles des partitions NetBSD}
 message Use_Existing {Utiliser les partitions existantes}
 message Megabytes {M�gaoctets}
 message Cylinders {Cylindres}
 message Sectors {Secteurs}
 message Select_medium {S�lection du m�dia d'installation}
 message ftp {FTP}
 message http {HTTP}
 message nfs {NFS}
 .if HAVE_INSTALL_IMAGE
 message cdrom {CD-ROM / DVD / install image media}	/* XXX translation */
 .else
 message cdrom {CD-ROM / DVD}
 .endif
 message floppy {Disquette}
 message local_fs {Syst�me de fichiers non-mont�}
 message local_dir {R�pertoire local mont�}
 message Select_your_distribution {S�lection de la distribution}
 message Full_installation {Installation compl�te}
 message Full_installation_nox {Installation sans X11}
 message Minimal_installation {Installation minimale}
 message Custom_installation {Installation personnalis�e}
 message hidden {** cach� **}
 message Host {Serveur FTP}
 message Base_dir {R�pertoire de base}
 message Set_dir_bin {R�pertoire des composants binaire}
 message Set_dir_src {R�pertoire des composants source}
 message Xfer_dir {R�pertoire de transfert}
 message User {Utilisateur}
 message Password {Mot de passe}
 message Proxy {Proxy}
 message Get_Distribution {R�cup�rer la distribution}
 message Continue {Continuer}
 message What_do_you_want_to_do {Que voulez-vous faire ?}
 message Try_again {R�essayer}
 message Set_finished {Extraction termin�e}
 message Skip_set {Sauter cet ensemble}
 message Skip_group {Sauter ce groupe}
 message Abandon {Abandonner l'installation}
 message Abort_fetch {Annuler la r�cup�ration}
 message Device {P�riph�rique}
 message File_system {Syst�me de fichiers}
 message Select_DNS_server {  Choisissez un serveur de noms :}
 message other {autre }
 message Perform_autoconfiguration {Configurer automatiquement ?}
 message Root_shell {Shell du compte "root"}
 message Color_scheme {Jeu de couleurs}
 message White_on_black {Blanc sur noir}
 message Black_on_white {Noir sur blanc}
 message White_on_blue {Blanc sur bleu}
 message Green_on_black {Vert sur noir}
 message User_shell {Shell du compte "user"}
 .if AOUT2ELF
 message aoutfail
+{
 Le r�pertoire o� se situent les anciennes librairies a.out doit �tre
 d�plac�. Veuillez suivre la proc�dure de mise � jour et bien
 v�rifier que tous les syst�mes de fichiers sont mont�s.
+}
 message emulbackup
+{
 Le r�pertoire /emul/aout ou /emul est pr�sent sur le disque mais
 pointe vers un r�pertoire non mont�. Nous l'avons renomm� en lui ajoutant
 l'extension ".old". Lorsque vous aurez termin� l'installation ou la mise � jour,
 vous devrez fusionner manuellement le nouveau r�pertoire avec l'ancien
 /emul/aout.
+}
 .endif
 message oldsendmail
+{
 Sendmail n'est plus distribu� dans cette version de NetBSD, le MTA par d�faut
 �tant maintenant postfix. Toutefois, le fichier /etc/mailer.conf est toujours
 configur� pour utiliser sendmail. Voulez-vous mettre � jour le fichier
 /etc/mailer.conf automatiquement pour utiliser postfix � la place ? Si vous
 choisissez "Non", vous devrez mettre � jour /etc/mailer.conf manuellement
 afin que vos courriels soient trait�s correctement.
+}
 message license
 {Afin d'utiliser l'interface r�seau : %s, vous devez accepter la licence
 contenue dans le fichier %s.
 Pour afficher ce fichier, tapez ^Z (Ctrl-Z).
 Apr�s l'avoir lu, tapez "fg" pour continuer.}
 message binpkg
 {Afin de configurer le syst�me de paquetages binaires, choisissez
 l'emplacement r�seau o� les paquetages se trouvent.  Une fois le syst�me
 red�marr�, vous pourrez utiliser 'pkgin' pour installer et am�nager des
 paquetages additionnels.}
 message pkgpath
 {Voici les configurations actuelles pour : protocole, serveur, r�pertoire,
 utilisateur et mot de passe qui seront utilis�s.  Si "utilisateur" est "ftp",
 un mot de passe n'est pas requis.
+}
 message rcconf_backup_failed {La copie de rc.conf a �chou�. Continuer ?}
 message rcconf_backup_succeeded {La copie de rc.conf a �t� sauvegard�e jusqu'� %s.}
 message rcconf_restore_failed {La restauration de la sauvegarde de rc.conf a �chou�.}
 message rcconf_delete_failed {La suppression de l'ancien fichier %s a �chou�.}
 message Pkg_dir {Dossier de paquetages}
 message configure_prior {configurer une installation existante de}
 message configure {configurer}
 message change {changer}
 message password_set {D�finir le mot de passe}
 message YES {OUI}
 message NO {NON}
 message DONE {TERMINER}
 message abandoned {Abandonn�e}
 message empty {***VIDE***}
 message timezone {Fuseau horaire}
 message change_rootpw {Changer le mot de passe "root"}
 message enable_binpkg {Activer l'installation de paquetages binaires}
 message enable_sshd {Activer sshd}
 message enable_ntpd {Activer ntpd}
 message run_ntpdate {Ex�cuter ntpdate au d�marrage}
 message enable_mdnsd {Activer mdnsd}
 message enable_xdm {Activer xdm}
 message enable_cgd {Activer cgd}
 message enable_lvm {Activer lvm}
 message enable_raid {Activer raidframe}
 message add_a_user {Ajouter un utilisateur}
 message configmenu {Configurer les items suivants si n�cessaire.}
 message doneconfig {Configuration termin�e}
 message Install_pkgin {Installer pkgin et mettre � jour le sommaire des paquetages}
 message binpkg_installed
 {Votre syst�me est maintenant configur� pour utiliser pkgin afin d'installer
 des paquetages binaires.  Pour installer un paquetage, utilisez :
 pkgin install <packagename>
 � partir d'un shell "root".  Consultez le manuel pkgin(1) pour plus de d�tails.}
 message Install_pkgsrc {Obtenir et extraire pkgsrc}
 message pkgsrc
 {L'installation de pkgsrc n�cessite l'extraction d'une archive obtenue
 par le r�seau.
 Voici les configurations actuelles pour : serveur, r�pertoire, utilisateur et
 mot de passe qui seront utilis�s.  Si "utilisateur" est "ftp", un mot de passe
 n'est pas requis.
+}
 message Pkgsrc_dir {R�pertoire pkgsrc}
 message get_pkgsrc
 {Obtenir et extraire pkgsrc afin de compiler des paquetages � partir des sources}
 message retry_pkgsrc_network {La configuration du r�seau a �chou�. R�essayer ?}
 message quit_pkgsrc {Quitter sans installer pkgsrc}
 message quit_pkgs_install {Quitter sans installer bin pkg}
 message pkgin_failed
 {L'installation de pkgin a �chou�, peut-�tre parce que son paquetage binaire
 n'existe pas.  V�rifiez le chemin et essayez � nouveau.}
 message failed {�chou�}
 message notsupported {Le fonctionnement n'est pas pris en charge!}
 message askfsmountadv {Point de montage ou de 'raid' ou 'cgd' ou 'lvm'?}
 message partman {Partitionnement �tendu}
 message editbsdpart {Modifier les partitions BSD}
 message editmbr {Modifiez et enregistrez MBR}
 message switchgpt {Mettre � GPT}
 message switchmbr {Basculer vers MBR}
 message renamedisk {D�finir le nom du disque}
 message fmtasraid {Format en RAID}
 message fmtaslvm {Format de LVM PV}
 message encrypt {Crypter}
 message setbootable {Drapeau d'amor�age}
 message erase {Fonction d'effacement s�curis�}
 message undo {Annuler les changements}
 message unconfig {Annulation de la configuration}
 message edit {�diter}
 message doumount {Groupe umount}
 message fillzeros {Remplir de z�ros}
 message fillrandom {Remplissez par des donn�es al�atoires}
 message fillcrypto {Remplissez par crypto donn�es}
 message raid0 {0 - Pas de parit�, l'entrelacement seulement simple.}
 message raid1 {1 - Mirroring. La parit� est le miroir.}
 message raid4 {4 - Entrelacement avec parit� stock�es sur le dernier composant. component.}
 message raid5 {5 - Entrelacement avec parit� � tous les composants. components.}
 message fremove {ENLEVER}
 message remove {Supprimer}
 message add {Ajouter}
 message auto {auto}
 message removepartswarn {Cette supprimer toutes les partitions sur le disque. Voulez-vous continuer? want to continue?}
 message saveprompt {Enregistrer les modifications avant de terminer?}
 message cantsave {Aucune modification ne peut �tre sauv�.}
 message noroot {Aucune partition racine d�fini, ne peut pas continuer \n continue\n}
 message wannaunblock {L'appareil est bloqu�. Voulez-vous forcer le d�bloquer et continuer? unblock it and continue?}
 message wannatry {Voulez-vous essayer?}
 message create_cgd {Le volume cryptographique Cr�er (CGD)}
 message create_cnd {Cr�er une image de disque virtuel (VND)}
 message create_vg {Cr�er un groupe de volumes LVM (VG)}
 message create_lv {      Cr�er un volume logique}
 message create_raid {Cr�er un RAID logiciel}
 message updpmlist {Mettre � jour la liste des dispositifs}
 message savepm {Enregistrer les modifications}
 message pmblocked {BLOQUE}
 message pmunchanged {INCHANG�}
 message pmsetboot {BOOT}
 message pmused {UTILIS�}
 message pmmounted {(mont�)}
 message pmunused {(non utilis�)}
 message pmgptdisk {Disque avec GPT}
 message finishpm {Terminer le partitionnement}
 message limitcount {Limite pour le nombre de dispositifs a �t� atteint!}
 message invaliddev {Blancs appareil!}
 message avdisks {Disques disponibles:}
 message nofreedev {Impossible d'allouer noeud de p�riph�rique!}
 message partman_header
 {Gestionnaire de partition. Tous les disques, les partitions et etc affich�.
 Dans un premier temps partitions MBR faire, puis faire �tiquette BSD.
 Si vous souhaitez utiliser RAID, LVM ou DMC, proc�dez comme suit:
 ) Cr�er les partitions BSD de type de besoin; 2) Cr�er un syst�me RAID /
 LVM VG / DMC utilisation de ces partitions; 3) la sauver;
 ) Cr�er des partitions pour les volumes RAID / DMC ou logique par LVM.}
 message raid_menufmt {   raid%d (niveau %1d) sur %-32s %11uM}
 message raid_err_menufmt {   RAID VIDE!}
 message raid_disks_fmt {Disques: %31s}
 message raid_spares_fmt {Pi�ces de rechange: %20s}
 message raid_level_fmt {Niveau RAID:      %22d}
 message raid_numrow_fmt {numRow:           %22d}
 message raid_numcol_fmt {numCol:           %22d}
 message raid_numspare_fmt {numSpare:         %22d}
 message raid_sectpersu_fmt {sectPerSU:        %22d}
 message raid_superpar_fmt {SUsPerParityUnit: %22d}
 message raid_superrec_fmt {SUsPerReconUnit:  %22d}
 message raid_nomultidim {Tableaux multi-dimensionnels sont pas pris en charge!}
 message raid_numrow_ask {numRow?}
 message raid_numcol_ask {numCol?}
 message raid_numspare_ask {numSpare?}
 message raid_sectpersu_ask {sectPerSU?}
 message raid_superpar_ask {SUsPerParityUnit?}
 message raid_superrec_ask {SUsPerReconUnit?}
 message raid_disks {Disques en RAID:}
 message vnd_err_menufmt {   PATH NOT DEFINED!}
 message vnd_assgn_menufmt {   vnd%1d sur %-50s ASSIGN}
 message vnd_menufmt {   vnd%1d sur %-44s %11uM}
 message vnd_path_fmt {Chemin du fichier: %20s}
 message vnd_assgn_fmt {Create new image: %14s}
 message vnd_size_fmt {Taille:            %20sM}
 message vnd_ro_fmt {Read-only:          %20s}
 message vnd_geom_fmt {D�finir la g�om�trie � la main: %8s}
 message vnd_bps_fmt {Octets par secteur: %20s}
 message vnd_spt_fmt {Secteurs par piste: %20s}
 message vnd_tpc_fmt {Pistes par cylindre: %19s}
 message vnd_cyl_fmt {Cylindres:          %20s}
 message vnd_path_ask {Chemin du fichier?}
 message vnd_size_ask {Taille (MB)?}
 message vnd_bps_ask {Octets par secteur?}
 message vnd_spt_ask {Secteurs par piste?}
 message vnd_tpc_ask {Pistes par cylindre?}
 message vnd_cyl_ask {Cylindres}
 message cgd_err_menufmt {   DISQUE NON DEFINI!}
 message cgd_menufmt {   cgd%1d %-48s %11uM}
 message cgd_dev_fmt {Dispositif de base: %20s}
 message cgd_enc_fmt {Chiffrage:          %20s}
 message cgd_key_fmt {Taille de la cl�:   %20d}
 message cgd_iv_fmt {Algorithme IV:      %20s}
 message cgd_keygen_fmt {La g�n�ration des cl�s: %16s}
 message cgd_verif_fmt {M�thode de v�rification: %15s}
 message lvm_disks {Disques � VG:}
 message lvm_menufmt {   %-44s %20sM}
 message lvm_err_menufmt {   VIDER VG!}
 message lvm_disks_fmt {PV's: %34s}
 message lvm_name_fmt {Nom: %35s}
 message lvm_maxlv_fmt {MaxLogicalVolumes:  %20s}
 message lvm_maxpv_fmt {MaxPhysicalVolumes: %20s}
 message lvm_extsiz_fmt {PhysicalExtentSize: %20s}
 message lvm_name_ask {Nom?}
 message lvm_maxlv_ask {MaxLogicalVolumes?}
 message lvm_maxpv_ask {MaxPhysicalVolumes?}
 message lvm_extsiz_ask {PhysicalExtentSize (MB)?}
 message lvmlv_menufmt {      Logique volume %-35s %11uM}
 message lvmlv_name_fmt {Nom: %35s}
 message lvmlv_size_fmt {Taille:   %29dM}
 message lvmlv_ro_fmt {Read-only: %29s}
 message lvmlv_cont_fmt {Contigu�:  %29s}
 message lvmlv_extnum_fmt {LogicalExtentsNumber: %18s}
 message lvmlv_minor_fmt {Nombre mineur: %25s}
 message lvmlv_mirrors_fmt {Miroirs:   %29d}
 message lvmlv_regsiz_fmt {MirrorLogRegionSize:  %18s}
 message lvmlv_pers_fmt {Persistante num�ro mineur: %13s}
 message lvmlv_readahsect_fmt {ReadAheadSectors: %22s}
 message lvmlv_stripes_fmt {Rayures:    %28s}
 message lvmlv_stripesiz_fmt {Stripesize: %28s}
 message lvmlv_zero_fmt {Remise � z�ro de la KB d'abord: %8s}
 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,1200 +1,1210 @@
-/*	$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
  *    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.
  * 3. The name of Piermont Information Systems Inc. may not be used to endorse
  *    or promote products derived from this software without specific prior
  *    written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``AS IS''
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PIERMONT INFORMATION SYSTEMS INC. BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 /* MI Message catalog -- polish, machine independent */
 message usage
 {uzycie: sysinst [-D] [-f plik_definicja] [-r wersja] [-C bg:fg]
+}
 /*
  * We can not use non ascii characters in this message - it is displayed
  * before the locale is set up!
  */
 message sysinst_message_language
 {Komunikaty instalacyjne w jezyku polskim}
 message sysinst_message_locale
 {pl_PL.ISO8859-2}
 message Yes {Tak}
 message No {Nie}
 message All {Wszystkie}
 message Some {Niektore}
 message None {Zadne}
 message none {zadne}
 message ok {ok}
 message OK {OK}
 message unchanged {niezmienione}
 message On {Wlaczone}
 message Off {Wylaczone}
 message Delete {Usunac?}
 message install
 {zainstalowac}
 message reinstall
 {przeinstaluj pakiety dla}
 message upgrade
 {zaktualizowac}
 message mount_failed
 {Montowanie %s nie powiodlo sie. Kontynuowac?
+}
 message hello
 {Witaj w sysinst, systemie instalacyjnym NetBSD-@@VERSION@@.
 To, oparte na menu, narzedzie zostalo stworzone aby pomoc ci zainstalowac
 NetBSD na twardym dysku, lub zaktualizowac istniejacy system NetBSD,
 zuzywajac minimum czasu.  W ponizszych menu mozesz zmienic aktualne
 ustawienia poprzez naciskanie klawiszy (a, b, c, ...). Klawisze strzalek
 takze moga dzialac.  Aktywujesz ustawienie poprzez nacisniecie ENTER.
+}
 message thanks
 {Dziekujemy za uzywanie NetBSD!
+}
 message installusure
 {Zdecydowales sie zainstalowac NetBSD na twardym dysku. Spowoduje to zmiane
 informacji na twoim dysku. Powinienes zrobic pelny backup danych przed
 rozpoczeciem tej procedury!  Zostana wykonane nastepujace czynnosci:
 	a) Podzial dysku twardego
 	b) Stworzenie nowych systemow plikow BSD
 	c) Wgranie i zainstalowanie pakietow dystrybucji
 (Po wprowadzeniu informacji o partycjach, ale jeszcze zanim twoj dysk
 zostanie zmieniony, bedziesz mial mozliwosc przerwac te procedure.)
 Czy kontynuowac?
+}
 message upgradeusure
 {Ok, zaktualizujmy NetBSD na twoim dysku.  Jak zawsze, spowoduje to
 zmiane informacji na twoim dysku. Powinienes zrobic pelny backup danych
 przed rozpoczeciem!  Czy napewno chcesz zaktualizowac NetBSD?
 (Jest to ostatnie ostrzezenie zanim zacznie sie modyfikacja danych na
 twoich dyskach.)
+}
 message reinstallusure
 {Ok, rozpakujmy pakiety dystrybucyjne NetBSD na bootowalny twardy dysk.
 Ta procedura tylko sciaga i rozpakowuje pakiety na pre-partycjonowany
 bootowalny dysk. Nie nazywa dyskow, aktualizuje bootblokow, lub zapisuje
 istniejacej konfiguracji.   (Wyjdz i wybierz `instaluj' lub
 `aktualizuj' jesli chcesz to zrobic.) Powinienes wykonac `instaluj' lub
 `aktualizuj' przed rozpoczeciem tej procedury!
 Czy napewno chcesz przeinstalowac pakiety dystrybucjne NetBSD?
 (Jest to ostatnie ostrzezenie zanim zacznie sie modyfikacja danych na
 twoich dyskach.)
+}
 message nodisk
 {Nie moge znalezc zadnych twardych dyskow do uzycia z NetBSD. Zostaniesz
 przeniesiony do menu glownego.
+}
 message onedisk
 {Znalazlem tylko jeden dysk, %s.  Stad przyjmuje, ze chcesz %s
 NetBSD wlasnie na nim.
+}
 message ask_disk
 {Na ktorym z nich chcesz %s NetBSD? }
 message Available_disks
 {Dostepne dyski}
 message heads
 {glowice}
 message sectors
 {sektory}
 message fs_isize
 {sredni rozmiar pliku (bajty)}
 message mountpoint
 {punkt montowania (lub 'zaden')}
 message cylname
 {cyl}
 message secname
 {sek}
 message megname
 {MB}
 message layout
 {NetBSD uzywa BSD disklabel aby pociac czesc dysku NetBSD na kilka
 partycji BSD.  Musisz teraz skonfigurowac BSD disklabel.
 Masz kilka mozliwosci. Sa one opisane ponizej.
 -- Standard: partycje BSD disklabel sa ustawiane przez ten program.
 -- Uzyj istniejacych: Uzywa aktualnych partycji. Musisz je zamontowac.
 Dysk NetBSD to %d Megabajtow.
 Standard wymaga przynajmniej %d Megabajtow.
 Standard z X Window System wymaga przynajmniej %d Megabajtow.
+}
 message Choose_your_size_specifier
 {Wybranie Megabajtow nada partycji rozmiar bliski twojemu wyborowi,
 ale dopasowany do granic cylindrow.  Wybranie sektorow pozwoli ci na
 bardziej dokladne okreslenie rozmiarow.  Na nowych dyskach ZBR rozmiar
 cylindra zmienia sie w zaleznosci od miejsca na dysku, jest wiec
 niewielka korzysc z dopasowania cylindrow.  Na starszych dyskach
 bardziej wydajne jest podawanie rozmiaru dysku, ktore sa
 wielokrotnoscia aktualnego rozmiaru cylindra.
 Wybierz specyfikator rozmiaru}
 message ptnsizes
 {Mozesz teraz zmienic rozmiary partycji systemowych. Domyslne ustawienia
 alokuja cala przestrzen na glowny system plikow, aczkolwiek mozesz zdefiniowac
 osobne partycje /usr (dodatkowe pliki systemowe), /var (dane systemowe i logi)
 lub /home (katalogi domowe uzytkownikow).
 Wolna przestrzen zostanie dodana do partycji oznaczonej '+'.
+}
 message ptnheaders
+{
        MB         Cylindry    Sektory   System plikow
+}
 message askfsmount
 {Punkt montowania?}
 message askfssize
 {Rozmiar dla %s w %s?}
 message askunits
 {Zmien jednostki wejsciowe (sektory/cylindry/MB)}
 message NetBSD_partition_cant_change
 {partycja NetBSD}
 message Whole_disk_cant_change
 {Caly dysk}
 message Boot_partition_cant_change
 {partycja uruchomic}
 message add_another_ptn
 {Dodaj partycje zdefiniowana przez uzytkownika}
 message fssizesok
 {Zaakceptuj rozmiary partycji. Wolne miejsce %d %s, %d wolnych partycji.}
 message fssizesbad
 {Zmniejsz rozmiary partycji o %d %s (%u sektorow).}
 message startoutsidedisk
 {Wartosc poczatkowa ktora podales jest poza koncem dysku.
+}
 message endoutsidedisk
 {Przy tej wartosci, koniec partycji znajduje sie poza koncem dysku. Rozmiar
 twojej partycji zostal zmniejszony do %d %s.
+}
 message toobigdisklabel
+{
 Ten dysk jest zbyt duzy dla tablicy partycji disklabel i dlatego
 nie moze zostac uzyty jako dysk starowy ani nie moze przechowywac
 glownej partycji.
+}
 message fspart
 {Mamy teraz twoje partycje BSD-disklabel jako:
+}
 message fspart_header	/* XXX abbreviations (or change fspart_row below) */
 {    Rozm %3s  Prze %3s Koniec %3s Typ SP     Ochrona Montowana Jako
    --------- --------- ---------- ---------- ------- ----- ----------
+}
 message fspart_row
 {%9lu %9lu %10lu %-10s %-7s %-9s %s}
 message show_all_unused_partitions
 {Pokaz wszystkie nieuzywane partycje}
 message partition_sizes_ok
 {Rozmiary partycji w porzadku}
 message edfspart
 {Powinienes najpierw ustawic rodzaj systemu plikow (SP).
 Pozniej inne wartosci.
 Aktualne wartosci dla partycji %c:
                           MB cylinders   sectors
                      ------- --------- ---------
+}
 message fstype_fmt
 { Typ systemu plikow: %9s}
 message start_fmt
 {           poczatek: %9u %8u%c %9u}
 message size_fmt
 {            rozmiar: %9u %8u%c %9u}
 message end_fmt
 {             koniec: %9u %8u%c %9u}
 message bsize_fmt
 {      rozmiar bloku: %9d bajtow}
 message fsize_fmt
 {  rozmiar fragmentu: %9d bajtow}
 message isize_fmt
 { Sredni rozm. pliku: %9d bajtow}
 message isize_fmt_dflt
 { Sredni rozm. pliku:         4 fragmenty}
 message newfs_fmt
 {              newfs: %9s}
 message mount_fmt
 {         montowanie: %9s}
 message mount_options_fmt
 {   opcje montowania: }
 message mountpt_fmt
 {   punkt montowania: %9s}
 message toggle
 {Przelacz}
 message restore
 {Odzyskaj oryginalne wartosci}
 message Select_the_type
 {Wybierz typ}
 message other_types
 {inne typy}
 message label_size
 {%s
 Specjalne wartosci, ktore moga byc podane jako wartosci rozmiaru:
     -1:   az do konca czesci dysku NetBSD
    a-%c:   zakoncz ta partycje tam gdzie partycja X sie zaczyna
 rozmiar (%s)}
 message label_offset
 {%s
 Specjalne wartosci, ktore moga byc podane jako wartosci przesuniecia:
     -1:   zacznij na poczatku czesci dysku NetBSD
    a-%c:   zacznij na koncu partycji X  (a, b, ... %c)
 poczatek (%s)}
 message invalid_sector_number
 {Zle uformowany numer sektora
+}
 message Select_file_system_block_size
 {Wybierz rozmiar bloku dla systemu plikow}
 message Select_file_system_fragment_size
 {Wybierz rozmiar fragmentu dla systemu plikow}
 message packname
 {Podaj nazwe dla swojego dysku NetBSD}
 message lastchance
 {Ok, jestesmy teraz gotowi zainstalowac NetBSD na twoim dysku (%s). Nic
 nie zostalo jeszcze zapisane. Masz teraz ostatnia szanse na przerwanie tego
 procesu poki nic nie zostalo jeszcze zmienione.
 Czy kontynuowac?
+}
 message disksetupdone
 {Okej, pierwsza czesc procedury zostala zakonczona. Sysinst zapisal
 disklabel na dysk doceloway, oraz utworzyl system plikow i sprawdzil
 nowe partycje, ktore podales jako docelowe.
+}
 message disksetupdoneupdate
 {Okej, pierwsza czesc procedury zostala zakonczona. Sysinst zapisal
 disklabel na dysk docelowy, oraz sprawdzil nowe partycje, ktore
 podales jako docelowe.
+}
 message openfail
 {Nie moglem otworzyc %s, blad: %s.
+}
 message mountfail
 {zamontowanie urzadzenia /dev/%s%c na %s nie powiodlo sie.
+}
 message extractcomplete
 {Rozpakowywanie wybranych pakietow dla NetBSD-@@VERSION@@ zakonczone.
 System moze sie teraz uruchomic z wybranego twardego dysku. Aby zakonczyc
 instalacje, sysinst da ci mozliwosc skonfigurowania kilku istotnych rzeczy.
+}
 message instcomplete
 {Instalacja NetBSD-@@VERSION@@ zostala zakonczona. System powinien
 uruchomic sie z twardego dysku. Wykonaj polecenia zawarte w pliku
 INSTALL o koncowej konfiguracji systemu.
 Przynajmniej powinienes wyedytowac /etc/rc.conf aby odpowiadal twoim
 potrzebom. Przegladnij /etc/defaults/rc.conf aby poznac domyslne wartosci.
+}
 message upgrcomplete
 {Aktualizacja NetBSD-@@VERSION@@ zostala zakonczona. Bedziesz teraz
 musial wykonac polecenia zawarte w pliku INSTALL, aby uzyskac system
 odpowiadajacy twoim potrzebom.
 Musisz przynajmniej dostosowac rc.conf do swojego lokalnego srodowiska
 i zmienic rc_configured=NO na rc_configured=YES inaczej start systemu
 zatrzyma sie na trybie jednego-uzytkownika, oraz skopiowac spowrotem
 pliki z haslami (biorac pod uwage nowe konta systemowe ktore mogly
 zostac utworzone dla tej wersji), jesli uzywales lokalnych plikow hasel.
+}
 message unpackcomplete
 {Rozpakowywanie dodatkowych pakietow NetBSD-@@VERSION@@ zostalo zakonczone.
 Musisz teraz wykonac
 polecenia zawarte w pliku INSTALL aby przekonfigurowac system do swoich
 potrzeb.
 Musisz przynajmniej dostosowac rc.conf do swojego lokalnego srodowiska
 i zmienic rc_configured=NO na rc_configured=YES inaczej start systemu
 zatrzyma sie na trybie jednego-uzytkownika.
+}
 message distmedium
 {Twoj dysk jest teraz gotowy na zainstalowanie jadra oraz pakietow
 dystrybucyjnych. Jak napisano w pliku INSTALL masz terz kilka opcji. Dla
 ftp lub nfs, musisz byc podlaczony do sieci z dostepem do odpowidnich maszyn.
 Pakietow wybranych %d, zainstalowanych %d. Nastepnym pakietem jest %s.
+}
 message distset
 {Dystrybucja NetBSD jest rozbita w kolekcje pakietow dystrybucyjnych.
 Czesc z nich to pakiety podstawowe wymagane przez wszystkie instalacje,
 a czesc nie jest przez wszystkie wymagana. Mozesz zainstalowac je
 wszystkie (Pelna instalacja) lub wybrac z opcjonalnych pakietow.
 } /* XXX add 'minimal installation' */
 message ftpsource
 {Ponizej masz site %s, katalog, uzytkownika, oraz haslo gotowe do uzycia.
 Jesli "uzytkownik" to "ftp", wtedy haslo nie jest wymagane.
+}
 message email
 {adres e-mail}
 message dev
 {urzadzenie}
 message nfssource
 {Wprowadz hosta NFS oraz katalog gdzie znajduje sie dystrybucja.
 Pamietaj, ze katalog musi zawierac pliki .tgz oraz, ze musi byc
 dostepny przez NFS.
+}
 message floppysource
 {Podaj urzadzenie bedace stacja dyskietek oraz katalog pomocniczy
 w docelowym systemie plikow. Pliki z pakietami instalacyjnymi musza
 znajdowac sie w glownym katalogu dyskietki.
+}
 message cdromsource
 {Podaj urzadzenie CDROM oraz katalog na CDROMie, w ktorym znajduje sie
 dystrybucja.
 Pamietaj, ze katalog musi zawierac pliki .tgz.
+}
 message Available_cds
 {Dostepne CD}
 message ask_cd
 {Znaleziono kilka CD, prosze wybrac CD zawierajcy instalacje.}
 message cd_path_not_found
 {Zbiory instalacyjne nie zostaly znalezione w domyslnym polozeniu na tym
 CD. Prosze sprawdzic urzadzenie i sciezke.}
 message localfssource
 {Podaj niezamountowane lokalne urzadzenie oraz katalog na nim, gdzie
 znajduje sie dystrybucja.
 Pamietaj, ze katalog musi zawierac pliki .tgz.
+}
 message localdir
 {Podaj aktualnie zamountowany lokalny katalog, gdzie znajduje sie dystrybucja.
 Pamietaj, ze katalog musi zawierac pliki .tgz.
+}
 message filesys
 {system plikow}
 message nonet
 {Nie znalazlem zadnych interfejsow sieciowych do uzycia z NetBSD.
 Zostaniesz przeniesiony do glownego menu.
+}
 message netup
 {Nastepujace interfejsy sieciowe sa aktywne: %s
 Czy ktorys z nich jest podlaczony do serwera?}
 message asknetdev
 {Ktorego urzadzenia mam uzyc?}
 message netdevs
 {Dost?pne interfejsy}
 message netinfo
 {Aby mozna bylo uzywac sieci, potrzebujemy odpowiedzi na ponizsze pytania:
+}
 message net_domain
 {Twoja domena DNS}
 message net_host
 {Twoja nazwa hosta}
 message net_ip
 {Twoj adres IPv4}
 message net_srv_ip
 {Server IPv4 address}
 message net_mask
 {Maska podsieci IPv4}
 message net_namesrv
 {Serwer nazw IPv4}
 message net_defroute
 {bramka IPv4}
 message net_media
 {Typ medium sieciowego}
 message netok
 {Ponizej sa wartosci, ktore wprowadziles.
 Domena DNS:		%s
 Nazwa hosta:		%s
 Serwer nazw:		%s
 Podstawowy interfejs:	%s
 Medium sieciowe:	%s
 Twoj adres IP:		%s
 Maska podsieci:		%s
 Bramka IPv4:		%s
+}
 message netok_slip
 {Ponizej sa wartosci, ktore wprowadziles. Czy sa poprawne?
 Domena DNS:		%s
 Nazwa hosta:		%s
 Serwer nazw:		%s
 Podstawowy interfejs:	%s
 Medium sieciowe:	%s
 Twoj adres IP:		%s
 Adres IP serwera:	%s
 Maska podsieci:		%s
 Bramka IPv4:		%s
+}
 message netokv6
 {Autkonfiguracja IPv6:	%s
+}
 message netok_ok
 {Czy sa poprawne?}
 message slattach {
 Podaja parametry dla polecenia 'slattach'
+}
 message wait_network
+{
 Poczekaj, az interfejs sieciowy zostanie uaktywniony.
+}
 message resolv
 {Nie moglem utworzyc /etc/resolv.conf.  Instalacja przerwana.
+}
 message realdir
 {Nie moglem przejsc do katalogu %s: %s.  Instalacja przerwana.
+}
 message delete_xfer_file
 {Usun po zakonczeniu instalacji}
 message notarfile
 {Pakiet %s nie istnieje.}
 message endtarok
 {Wszystkie wybrane pakiety dystrybucji zostaly rozpakowane.}
 message endtar
 {Wystapil blad w trackie rozpakowywania pakietow.
 Twoja instalacja jest niekompletna.
 Wybrales %d pakietow dystrybucyjnych.  %d pakiety nie zostaly znalezione
 i %d zostalo pominietych z powodu bledow. Z  %d wyprobowanych,
 %d rozpakowalo sie bez bledow i %d z bledami.
 Instalacja zostala przerwana. Sprawdz zrodlo swojej dystrybucji i rozwaz
 reinstalacje pakietow z glownego menu.}
 message abort
 {Wybrane przez ciebie opcje spowodowaly, ze zainstalowanie NetBSD jest
 nie mozliwe. Instalacja zostala przerwana.
+}
 message abortinst
 {Dystrybucja nie zostala pomyslnie wgrana. Bedziesz musial zrobic to recznie.
 Instalacja zostala przerwana.
+}
 message abortupgr
 {Dystrybucja nie zostala pomyslnie wgrana. Bedziesz musial zrobic to recznie.
 Aktualizacja zostala przerwana.
+}
 message abortunpack
 {Rozpakowanie dodatkowych pakietow nie udalo sie. Bedziesz musial
 to zrobic recznie, albo wybierz inne zrodlo pakietow i sprobuj ponownie.
+}
 message createfstab
 {Pojawil sie powazny problem! Nie mozna utworzyc /mnt/etc/fstab. Spadamy!
+}
 message noetcfstab
 {Pomocy! Na dysku docelowym %s nie ma /etc/fstab. Przerywamy aktualizacje.
+}
 message badetcfstab
 {Pomocy! Nie moge przeczytac /etc/fstab na dysku %s. Przerywamy aktualizacje.
+}
 message X_oldexists
 {Nie moge zapisac %s/bin/X jako %s/bin/X.old, poniewaz
 na docelowym dysku jest juz %s/bin/X.old. Napraw to przed kontynuacja.
 Jedyny sposob to uruchomic powloke z menu Narzedziowego i sprawdzic
 docelowe %s/bin/X oraz %s/bin/X.old. Jesli
 %s/bin/X.old pochodzi z zakonczonej aktualizacji, mozesz usunac
 %s/bin/X.old i zrobic restart. Albo jesli %s/bin/X.old
 pochodzi z aktualnej niekompletnej aktualizacji, mozesz usunac
 %s/bin/X i przeniesc %s/bin/X.old na %s/bin/X.
 Przerywamy aktualizacje.}
 message netnotup
 {Pojawil sie problem z konfiguracja twojej sieci. Albo twoja bramka
 albo serwer nazw nie byl osiagalny przez ping. Czy chcesz skonfigurowac
 siec jeszcze raz? (Nie pozwala ci kontynuowac lub przerwac instalacje.)
+}
 message netnotup_continueanyway
 {Czy chcesz kontynuowac proces instalacji i zalozyc, ze twoja siec dziala?
 (Nie przerywa procesu instalacji.)
+}
 message makedev
 {Tworzenie plikow urzadzen ...
+}
 /* XXX: Translate:
 * -not successful.  The upgrade has been aborted.  (Error number %d.)
 * +not successful (Error number %d.). Try mounting it anyway?
 */
 message badfs
 {Wyglada na to, ze /dev/%s%c nie jest systemem plikow BSD ewentualnie
 fsck dysku nie powiodlo sie. Zamontowac dysk pomimo tego? (Numer
 bledu %d.)}
 message rootmissing
 { docelowy / jest zagubiony %s.
+}
 message badroot
 {Kompletny nowy system plikow nie przeszedl podstawowych testow.
  Jestes pewien, ze zainstalowales wszystkie wymagane pakiety?
+}
 message fd_type
 {System plikow na dyskietce}
 message fdnotfound
 {Nie moglem znalezc pliku na dysku.
+}
 message fdremount
 {Dyskietka nie zostala pomyslnie zamountowana.
+}
 message fdmount
 {Wloz dyskietke zawierajaca plik "%s.%s".
 Jezeli nie masz juz wiecej dyskietek, wybierz "Pakiet kompletny"
 aby rozpoczac proces jego instalacji. Wybierz "Przerwij pobieranie"
 zeby wybrac inne zrodlo oprogramowania.
+}
 message mntnetconfig
 {Czy informacje o sieci, ktore podales sa prawidlowe dla tej maszyny
 w reguralnej pracy i czy chcesz aby je zapisac w /etc? }
 message cur_distsets
 {Ponizej jest lista pakietow dystrybucyjnych, ktore zostana uzyte.
+}
 message cur_distsets_header
 {Pakiet dystryb.                   Uzyc?
 --------------------------------- -----
+}
 message set_base
 {Base}
 message set_system
 {System (/etc)}
 message set_compiler
 {Narzedzia Kompilacyjne}
 message set_games
 {Gry}
 message set_man_pages
 {Strony Podrecznika}
 message set_misc
 {Inne}
 message set_modules
 {Moduly kernela}
 message set_tests
 {Programy testujace}
 message set_text_tools
 {Narzedzia Przetwarzania Tekstu}
 message set_X11
 {Pakiety X11}
 message set_X11_base
 {X11 base oraz klienci}
 message set_X11_etc
 {Konfiguracja X11}
 message set_X11_fonts
 {Czcionki X11}
 message set_X11_servers
 {Serwery X11}
 message set_X11_prog
 {Programowanie X11}
 message set_source
 {Source and debug sets}
 message set_syssrc
 {Kernel sources}
 message set_src
 {Base sources}
 message set_sharesrc
 {Share sources}
 message set_gnusrc
 {GNU sources}
 message set_xsrc
 {X11 sources}
 message set_debug
 {Debug symbols}
 message set_xdebug
 {X11 debug symbols}
 message cur_distsets_row
 {%-30s %3s}
 message select_all
 {Wybierz wszystkie powyzsze pakiety}
 message select_none
 {Odznasz wszystkie powyzsze pakiety}
 message install_selected_sets
 {Zainstaluj wybrane pakiety}
 message tarerror
 {Pojawil sie blad w trakcie rozpakowywanie pliku %s. To znaczy, ze
 pewne pliki nie zostaly prawidlowo rozpakowane i twoj system
 nie bedzie kompletny.
 Kontynuowac rozpakowywanie pakietow?}
 message must_be_one_root
 {Musi byc tylko jedna partycja do zamontowania pod '/'.}
 message partitions_overlap
 {partycje %c i %c pokrycia.}
 message No_Bootcode
 {Brak kodu startowego dla glownej partycji}
 message cannot_ufs2_root
 {Glowny system plikow nie moze byc FFSv2 poniewaz nie ma kodu startowego dla
 tej platformy.}
 message edit_partitions_again
+{
 Mozesz albo wyedytowac tablice partycji recznie, albo poddac sie
 i powrocic do glownego menu.
 Edytowac tablice partycji ponownie ?}
 message config_open_error
 {Nie moglem otworzyc pliku konfiguracyjnego %s\n}
 message choose_timezone
 {Wybierz strefe czasowa, ktora najlepiej ci odpowiada z ponizszej listy.
 Nacisnij ENTER aby wybrac.
 Nacisnij 'x' a potem ENTER aby wyjsc.
  Domyslna:	%s
  Wybrana:	%s
  Lokalny czas:	%s %s
+}
 message tz_back
 {Powroc do glownej listy stref}
 message swapactive
 {Dysk, ktory wybrales posiada partycje wymiany, ktora moze byc aktualnie
 w uzyciu jesli twoj system ma malo pamieci. Poniewaz chcesz zmienic uklad
 partycji, partycja wymiany zostanie teraz wylaczona. Moze to spowodowac
 pojawienie sie bledow. Jesli zuwazysz takie bledy zrestartuj komputer,
 a nastepnie sprobuj jeszcze raz.}
 message swapdelfailed
 {Sysinst nie mogl deaktywowac partycji wymiany na dysku, ktory wybrales
 do instalacji. Zrestartuj komputer i sprobuj jeszcze raz.}
 message rootpw
 {Haslo root'a w nowo zainstalowanym systemie nie zostalo jeszcze ustawione,
 i dlatego jest puste. Czy chcesz ustawic haslo dla root'a teraz?}
 message rootsh
 {Mozesz  teraz wybrac, ktorej powloki ma uzywac uzytkownik root. Domyslnie
 jest to /bin/sh, ale moze preferujesz inna.}
 message no_root_fs
+{
 Nie zdefiniowano glownego systemu plikow. Musisz zdefiniowac przynajmniej
 jeden mountpoint z "/".
 Nacisnij <enter> aby kontynuowac.
+}
 message Pick_an_option {Wybierz opcje aby je wlaczyc lub wylaczyc.}
 message Scripting {Skrypty}
 message Logging {Logowanie}
 message Status  {   Status: }
 message Command {Polecenie: }
 message Running {Uruchamianie}
 message Finished {Zakonczone}
 message Command_failed {Polecenie nie powiodlo sie}
 message Command_ended_on_signal {Polecenie zakonczylo sie sygnalem}
 message NetBSD_VERSION_Install_System {System Instalacyjny NetBSD-@@VERSION@@}
 message Exit_Install_System {Wyjdz z Systemu Instalacyjnego}
 message Install_NetBSD_to_hard_disk {Zainstaluj NetBSD na twardym dysku}
 message Upgrade_NetBSD_on_a_hard_disk {Zaktualizuj NetBSD na twardym dysku}
 message Re_install_sets_or_install_additional_sets {Przeinstaluj albo zainstaluj dodatkowe pakiety}
 message Reboot_the_computer {Zrestartuj komputer}
 message Utility_menu {Menu Narzedziowe}
 message Config_menu {Menu konfiguracji}
 message exit_menu_generic {Nazad}
 message exit_utility_menu {Exit}
 message NetBSD_VERSION_Utilities {Narzedzia NetBSD-@@VERSION@@}
 message Run_bin_sh {Uruchom /bin/sh}
 message Set_timezone {Ustaw strefe czasowa}
 message Configure_network {Skonfiguruj siec}
 message Partition_a_disk {Skonfiguruj dysk}
 message Logging_functions {Funkcje logowania}
 message Halt_the_system {Zatrzymaj system}
 message yes_or_no {tak lub nie?}
 message Hit_enter_to_continue {Nacisnij enter aby kontynuowac}
 message Choose_your_installation {Wybierz swoja instalacje}
 message Set_Sizes {Ustaw rozmiary partycji NetBSD}
 message Use_Existing {Uzyj istniejacych romiarow partycji}
 message Megabytes {Megabajty}
 message Cylinders {Cylindry}
 message Sectors {Sektory}
 message Select_medium {Wybierz medium}
 message ftp {FTP}
 message http {HTTP}
 message nfs {NFS}
 .if HAVE_INSTALL_IMAGE
 message cdrom {CD-ROM / DVD / install image media}	/* XXX translation */
 .else
 message cdrom {CD-ROM / DVD}
 .endif
 message floppy {Dyskietka}
 message local_fs {Niezamontowany SP}
 message local_dir {Lokalny katalog}
 message Select_your_distribution {Wybierz swoja dystrybucje}
 message Full_installation {Pelna instalacja}
 message Full_installation_nox {Instalacja bez X11}
 message Minimal_installation {Minimalna instalacja}
 message Custom_installation {Inna instalacja}
 message hidden {** ukryte **}
 message Host {Host}
 message Base_dir {Katalog}
 message Set_dir_src {Katalog pakiet binary} /* fix XLAT */
 message Set_dir_bin {Katalog pakiet source} /* fix XLAT */
 message Xfer_dir {Transfer Katalog} /* fix XLAT */
 message User {Uzytkownik}
 message Password {Haslo}
 message Proxy {Proxy}
 message Get_Distribution {Sciagnij Dystrybucje}
 message Continue {Kontynuuj}
 message What_do_you_want_to_do {Co chcesz zrobic?}
 message Try_again {Sprobowac jeszcze raz}
 message Set_finished {Pakiet kompletny}
 message Skip_set {Pomin pakiet}
 message Skip_group {Pomin grupe pakietow}
 message Abandon {Przerwij instalacje}
 message Abort_fetch {Przerwij pobieranie}
 message Device {Urzadzenie}
 message File_system {SystemPlikow}
 message Select_DNS_server {  Wybierz serwer nazw}
 message other {inny  }
 message Perform_autoconfiguration {Wykonac autkonfiguracje?}
 message Root_shell {Powloka root'a}
 message Color_scheme {Kolorystyka}
 message White_on_black {Bia�y na czarnym}
 message Black_on_white {Czarno na bia�ym}
 message White_on_blue {Bia�y na niebieskim}
 message Green_on_black {Zielony na czarnym}
 message User_shell {Powloka user'a}
 .if AOUT2ELF
 message aoutfail
 {Katalog do ktorego stare a.out wspoldzielone biblioteki powinny byc
 przeniesione nie moze zostac utworzony. Sproboj jeszcze raz procedury
 aktualizacji i upewnij sie, ze zamountowales wszystkie systemy plikow.}
 message emulbackup
 {Albo /emul/aout albo /emul w twoim systemie byl symbolicznym linkiem
 wskazujacym na niezamontowany system. Zostalo mu dodane rozszerzenie '.old'.
 Kiedy juz uruchomisz swoj zaktualizowany system, mozliwe ze bedziesz musial
 zajac sie polaczeniem nowo utworzonego /emul/aout ze starym.
+}
 .endif
 message oldsendmail
 {Sendmail nie jest dostepny w tym wydaniu NetBSD. Domyslnym MTA jest
 postfix. Plik /etc/mailer.conf ciagle wskazuje usuniety program
 sendmail. Chcesz automatycznie uaktualnic /etc/mailer.conf dla
 postfix? Jesli wybierzesz "Nie", trzeba bedzie recznie zmienic
 /etc/mailer.conf, aby dzialalo dostarczanie poczty.}
 message license
 {Aby uzywac interfejsu sieciowego %s, musisz zgodzic sie na licencje
 zawarta w pliku %s.
 Aby obejrzec ten plik, mozesz wpisac ^Z, przejrzec jego zawartosc,
 a nastepnie wpisac "fg".}
 message binpkg
 {Aby skonfigurowac binarny system pakietow, wybierz lokalizacje siecowa, z
 ktorej nalezy pobrac pakiety. Gdy system wstanie, mozesz wykorzystac 'pkgin' do
 zainstalowania albo odinstalowania dodatkowych pakietow.}
 message pkgpath
 {Ponizej wyszczegolniono protokol, hosta, katalog, nazwe uzytkownika oraz haslo,
 ktore beda wykorzystane do nawiazania polaczenia. Haslo nie jest wymagane gdy
 nazwa uzytkownika to "ftp".
+}
 message rcconf_backup_failed {Stworzenie kopii zapasowej rc.conf nie powiodlo
 sie. Kontynuowac?}
 message rcconf_backup_succeeded {Kopia zapasowa rc.conf zostala zapisana do %s.}
 message rcconf_restore_failed {Przywracania kopii zapasowej rc.conf nie powiodlo
 sie.}
 message rcconf_delete_failed {Usuwanie starego wpisu %s nie powiodlo sie.}
 message Pkg_dir {Katalog z pakietami}
 message configure_prior {skonfiguruj przed instalacja}
 message configure {skonfiguruj}
 message change {zmien}
 message password_set {ustawiono haslo}
 message YES {TAK}
 message NO {NIE}
 message DONE {ZAKONCZ}
 message abandoned {Porzucony}
 message empty {***PUSTE***}
 message timezone {Strefa czasowa}
 message change_rootpw {Zmien haslo root'a}
 message enable_binpkg {Wlacz instalacje pakietow binarnych}
 message enable_sshd {Wlacz sshd}
 message enable_ntpd {Wlacz ntpd}
 message run_ntpdate {uruchom ntpdate podczas startu systemu}
 message enable_mdnsd {Wlacz mdnsd}
 message enable_xdm {Enable xdm}
 message enable_cgd {Enable cgd}
 message enable_lvm {Enable lvm}
 message enable_raid {Enable raidframe}
 message add_a_user {Add a user}
 message configmenu {Skonfiguruj dodatkowe elementy w razie potrzeby.}
 message doneconfig {Konfiguracja zakonczona}
 message Install_pkgin {Zainstaluj pkgin i uaktualnij podsumowanie pakietow}
 message binpkg_installed
 {Skonfigurowales system tak aby wykorzystywal pkgin do instalacji pakietow
 binarnych. Aby zainstalowac pakiet, wykonaj:
 pkgin install <packagename>
 z powloki root'a. Jesli potrzebujesz wiecej informacji przeczytaj strone
 podrecznika pkgin(1).}
 message Install_pkgsrc {Pobierz i rozpakuj pkgsrc}
 message pkgsrc
 {Instalacja pkgsrc wymaga rozpakowania archiwum pobranego z sieci.
 Ponizej wyszczegolniono protokol, hosta, katalog, nazwe uzytkownika oraz haslo,
 ktore beda wykorzystane do nawiazania polaczenia. Haslo nie jest wymagane gdy
 nazwa uzytkownika to "ftp".
+}
 message Pkgsrc_dir {katalog pkgsrc}
 message get_pkgsrc {Pobierz i rozpakuj pkgsrc w celu tworzenia pakietow ze
 zrodel}
 message retry_pkgsrc_network {Konfiguracja sieci nie powiodla sie. Sprobowac
 ponownie?}
 message quit_pkgsrc {Zakoncz bez zainstalowania pkgsrc}
 message quit_pkgs_install {Zakoncz bez zainstalowania bin pkg}
 message pkgin_failed
 {Instalacja pkgin nie powiodla sie, prawdopodobnie dlatego ze nie znaleziono
 pakietow binarnych.
 Sprawdz sciezke pakietow i sprobuj ponownie.}
 message failed {Nie powiodlo sie}
 message notsupported {Operacja nie jest obs�ugiwana!}
 message askfsmountadv {Montowania lub "raid" lub "cgd" lub "lvm"?}
 message partman {Partycje rozszerzone}
 message editbsdpart {Edytuj partycje BSD}
 message editmbr {Edytowa� i zapisywa� MBR}
 message switchgpt {Prze��cz na GPT}
 message switchmbr {Prze��cz na MBR}
 message renamedisk {Ustaw nazw� dysku}
 message fmtasraid {Format jak RAID}
 message fmtaslvm {Format jak LVM PV}
 message encrypt {Szyfrowanie}
 message setbootable {Bootable flaga}
 message erase {Bezpieczne kasowanie}
 message undo {Cofanie zmian}
 message unconfig {Zdekonfigurowanie}
 message edit {Edytuj}
 message doumount {Si�a umount}
 message fillzeros {Wype�nij zerami}
 message fillrandom {Wype�nij losowymi danymi}
 message fillcrypto {Wype�nij przez crypto danych}
 message raid0 {0 - brak parzysto�ci, tylko proste rozk�adanie.}
 message raid1 {1 - Mirroring. Parytet jest lustro.}
 message raid4 {4 - Malowanie z parytetu przechowywanych w ostatniej cz�ci.}
 message raid5 {5 - Malowanie z parytetu w tych wszystkich element�w.}
 message fremove {USU�}
 message remove {Usun��}
 message add {Doda�}
 message auto {auto}
 message removepartswarn {To usun�� wszystkie partycje na dysku. Czy chcesz kontynuowa�?}
 message saveprompt {Zapisz zmiany przed zako�czeniem?}
 message cantsave {Zmiany nie mog� by� zbawieni.}
 message noroot {No partycja zdefiniowana, nie mo�e kontynuowa� \n}
 message wannaunblock {Urz�dzenie jest zablokowane. Czy chcesz, aby zmusi� go odblokowa� i kontynuowa�?}
 message wannatry {Czy chcesz spr�bowa�?}
 message create_cgd {Utw�rz wolumen kryptograficznych (CGD)}
 message create_cnd {Utw�rz wirtualnego obraz dysku (VND)}
 message create_vg {Utw�rz grup� wolumin�w (LVM VG)}
 message create_lv {      Utw�rz wolumin logiczny}
 message create_raid {Utw�rz oprogramowania RAID}
 message updpmlist {Aktualizuj list� urz�dze�}
 message savepm {Zapisz zmiany}
 message pmblocked {ZABLOK.}
 message pmunchanged {BEZ ZMIAN}
 message pmsetboot {BOOT}
 message pmused {U�YWANE}
 message pmmounted {(zamontowany)}
 message pmunused {(nieu�ywany)}
 message pmgptdisk {Dysku z GPT}
 message finishpm {Zako�cz partycjonowanie}
 message limitcount {Limit liczby urz�dze� zosta� osi�gni�ty!}
 message invaliddev {Nieprawid�owy urz�dzenie!}
 message avdisks {Dost�pne dysk�w:}
 message nofreedev {Nie mo�na przydzieli� w�ze�!}
 message partman_header
 {Partition Manager. Wszystkie dyski, partycje oraz itp. tam wy�wietlane.
 Pocz�tkowo sprawiaj� partycji MBR, a nast�pnie dokona� BSD etykiet�.
 Je�li chcesz korzysta� z RAID, LVM lub CGD, wykonaj nast�puj�ce kroki:
 ) Tworzenie partycji BSD z potrzebnego typu;
 ) Utw�rz RAID / LVM VG / CGD korzystania z tych partycji; 3) Zapisz go;
 ) Tworzenie partycji dla RAID / CGD lub Logical Volumes dla LVM.}
 message raid_menufmt {   raid%d (level %1d) on %-34s %11uM}
 message raid_err_menufmt {   EMPTY RAID!}
 message raid_disks_fmt {Dyski: %33s}
 message raid_spares_fmt {Cz�ci zamienne: %23s}
 message raid_level_fmt {Poziom RAID:     %23d}
 message raid_numrow_fmt {numRow:          %23d}
 message raid_numcol_fmt {numCol:          %23d}
 message raid_numspare_fmt {numSpare:        %23d}
 message raid_sectpersu_fmt {sectPerSU:        %22d}
 message raid_superpar_fmt {SUsPerParityUnit: %22d}
 message raid_superrec_fmt {SUsPerReconUnit:  %22d}
 message raid_nomultidim {Tablice wielowymiarowe nie s� obs�ugiwane!}
 message raid_numrow_ask {numRow?}
 message raid_numcol_ask {numCol?}
 message raid_numspare_ask {numSpare?}
 message raid_sectpersu_ask {sectPerSU?}
 message raid_superpar_ask {SUsPerParityUnit?}
 message raid_superrec_ask {SUsPerReconUnit?}
 message raid_disks {Dyski w RAID:}
 message vnd_err_menufmt {   �CIE�KA NIE ZDEFINIOWANE!}
 message vnd_assgn_menufmt {   vnd%1d na %-51s ASSIGN}
 message vnd_menufmt {   vnd%1d na %-45s %11uM}
 message vnd_path_fmt {�cie�ka: %31s}
 message vnd_assgn_fmt {Create new image: %11s}
 message vnd_size_fmt {Rozmiar: %30sM}
 message vnd_ro_fmt {Tylko do odczytu:   %20s}
 message vnd_geom_fmt {Ustaw geometri� r�cznie: %15s}
 message vnd_bps_fmt {Bajt�w na sektor�w: %20s}
 message vnd_spt_fmt {Sektory na �cie�ki: %20s}
 message vnd_tpc_fmt {Utwory na cylinder: %20s}
 message vnd_cyl_fmt {Si�owniki:          %20s}
 message vnd_path_ask {File Path?}
 message vnd_size_ask {Rozmiar (MB)?}
 message vnd_bps_ask {Bajt�w na sektor?}
 message vnd_spt_ask {Sektory na �cie�k�?}
 message vnd_tpc_ask {Utwory na cylinder?}
 message vnd_cyl_ask {Cylindry}
 message cgd_err_menufmt {   DISK NIE ZDEFINIOWANE!}
 message cgd_menufmt {   cgd%1d %-48s %11uM}
 message cgd_dev_fmt {Urz�dzenie podstawy: %19s}
 message cgd_enc_fmt {Encryption:           %19s}
 message cgd_key_fmt {Rozmiar klucza:      %19d}
 message cgd_iv_fmt {Algorytm IV: %27s}
 message cgd_keygen_fmt {Generowanie kluczy: %20s}
 message cgd_verif_fmt {Metoda weryfikacji: %20s}
 message lvm_disks {Dyski w VG:}
 message lvm_menufmt {   %-44s %20sM}
 message lvm_err_menufmt {   EMPTY VG!}
 message lvm_disks_fmt {PV's: %34s}
 message lvm_name_fmt {Nazwa: %33s}
 message lvm_maxlv_fmt {MaxLogicalVolumes:  %20s}
 message lvm_maxpv_fmt {MaxPhysicalVolumes: %20s}
 message lvm_extsiz_fmt {PhysicalExtentSize: %20s}
 message lvm_name_ask {Nazwa?}
 message lvm_maxlv_ask {MaxLogicalVolumes?}
 message lvm_maxpv_ask {MaxPhysicalVolumes?}
 message lvm_extsiz_ask {PhysicalExtentSize (MB)?}
 message lvmlv_menufmt {      Wolumin logiczny%-34s %11uM}
 message lvmlv_name_fmt {Nazwa: %33s}
 message lvmlv_size_fmt {Rozmiar: %30dM}
 message lvmlv_ro_fmt {Read-only:       %23s}
 message lvmlv_cont_fmt {S�siaduj�cy:     %23s}
 message lvmlv_extnum_fmt {LogicalExtentsNumber: %18s}
 message lvmlv_minor_fmt {Mniejsza liczba: %23s}
 message lvmlv_mirrors_fmt {Mirrors:     %27d}
 message lvmlv_regsiz_fmt {MirrorLogRegionSize:  %18s}
 message lvmlv_pers_fmt {Trwa�e drobne numer:  %18s}
 message lvmlv_readahsect_fmt {ReadAheadSectors ceny: %17s}
 message lvmlv_stripes_fmt {Stripes:     %27s}
 message lvmlv_stripesiz_fmt {StripeSize:  %27s}
 message lvmlv_zero_fmt {Zerowanie pierwszej KB: %16s}
 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,629 +1,633 @@
-/*	$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.
  * 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.
  * 3. The name of Piermont Information Systems Inc. may not be used to endorse
  *    or promote products derived from this software without specific prior
  *    written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``AS IS''
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PIERMONT INFORMATION SYSTEMS INC. BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 /* md.c -- i386 machine specific routines - also used by amd64 */
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/exec.h>
 #include <sys/utsname.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <machine/cpu.h>
 #include <stdio.h>
 #include <stddef.h>
 #include <util.h>
 #include <dirent.h>
 #include <termios.h>
 #include "defs.h"
 #include "md.h"
 #include "endian.h"
 #include "msg_defs.h"
 #include "menu_defs.h"
 #ifdef NO_LBA_READS		/* for testing */
 #undef BIFLAG_EXTINT13
 #define BIFLAG_EXTINT13	0
 #endif
 static struct biosdisk_info *biosdisk = NULL;
 /* prototypes */
 static int get_bios_info(char *);
 static int mbr_root_above_chs(void);
 static void md_upgrade_mbrtype(void);
 static int md_read_bootcode(const char *, struct mbr_sector *);
 static unsigned int get_bootmodel(void);
 void
 md_init(void)
+{
+}
 void
 md_init_set_status(int flags)
+{
 	(void)flags;
 	/* Default to install same type of kernel as we are running */
 	set_kernel_set(get_bootmodel());
+}
 int
 md_get_info(void)
+{
 	mbr_info_t *ext;
 	struct mbr_partition *p;
 	const char *bootcode;
 	int i;
 	int names, fl, ofl;
 #define	ACTIVE_FOUND	0x0100
 #define	NETBSD_ACTIVE	0x0200
 #define	NETBSD_NAMED	0x0400
 #define	ACTIVE_NAMED	0x0800
 	if (pm->no_mbr)
 		return 1;
 	if (read_mbr(pm->diskdev, &mbr) < 0)
 		memset(&mbr.mbr, 0, sizeof mbr.mbr - 2);
 	get_bios_info(pm->diskdev);
 edit:
 	if (edit_mbr(&mbr) == 0)
 		return 0;
 	root_limit = 0;
 	if (biosdisk != NULL && (biosdisk->bi_flags & BIFLAG_EXTINT13) == 0) {
 		if (mbr_root_above_chs()) {
 			msg_display(MSG_partabovechs);
 			if (!ask_noyes(NULL))
 				goto edit;
 			/* The user is shooting themselves in the foot here...*/
 		} else
 			root_limit = bcyl * bhead * bsec;
+	}
 	/*
 	 * Ensure the install partition (at sector pm->ptstart) and the active
 	 * partition are bootable.
 	 * Determine whether the bootselect code is needed.
 	 * Note that MBR_BS_NEWMBR is always set, so we ignore it!
 	 */
 	fl = 0;
 	names = 0;
 	for (ext = &mbr; ext != NULL; ext = ext->extended) {
 		p = ext->mbr.mbr_parts;
 		for (i = 0; i < MBR_PART_COUNT; p++, i++) {
 			if (p->mbrp_flag == MBR_PFLAG_ACTIVE) {
 				fl |= ACTIVE_FOUND;
 			    if (ext->sector + p->mbrp_start == pm->ptstart)
 				fl |= NETBSD_ACTIVE;
+			}
 			if (ext->mbrb.mbrbs_nametab[i][0] == 0) {
 				/* No bootmenu label... */
 				if (ext->sector == 0)
 					continue;
 				if (ext->sector + p->mbrp_start == pm->ptstart)
 					/*
 					 * Have installed into an extended ptn
 					 * force name & bootsel...
 					 */
 					names++;
 				continue;
+			}
 			/* Partition has a bootmenu label... */
 			if (ext->sector != 0)
 				fl |= MBR_BS_EXTLBA;
 			if (ext->sector + p->mbrp_start == pm->ptstart)
 				fl |= NETBSD_NAMED;
 			else if (p->mbrp_flag == MBR_PFLAG_ACTIVE)
 				fl |= ACTIVE_NAMED;
 			else
 				names++;
+		}
+	}
 	if (!(fl & ACTIVE_FOUND))
 		fl |= NETBSD_ACTIVE;
 	if (fl & NETBSD_NAMED && fl & NETBSD_ACTIVE)
 		fl |= ACTIVE_NAMED;
 	if ((names > 0 || !(fl & NETBSD_ACTIVE)) &&
 	    (!(fl & NETBSD_NAMED) || !(fl & ACTIVE_NAMED))) {
 		/*
 		 * There appear to be multiple bootable partitions, but they
 		 * don't all have bootmenu texts.
 		 */
 		msg_display(MSG_missing_bootmenu_text);
 		if (ask_yesno(NULL))
 			goto edit;
+	}
 	if ((fl & MBR_BS_EXTLBA) &&
 	    (biosdisk == NULL || !(biosdisk->bi_flags & BIFLAG_EXTINT13))) {
 		/* Need unsupported LBA reads to read boot sectors */
 		msg_display(MSG_no_extended_bootmenu);
 		if (!ask_noyes(NULL))
 			goto edit;
+	}
 	/* Sort out the name of the mbr code we need */
 	if (names > 0 || fl & (NETBSD_NAMED | ACTIVE_NAMED)) {
 		/* Need bootselect code */
 		fl |= MBR_BS_ACTIVE;
 		bootcode = fl & MBR_BS_EXTLBA ? _PATH_BOOTEXT : _PATH_BOOTSEL;
 	} else
 		bootcode = _PATH_MBR;
 	fl &=  MBR_BS_ACTIVE | MBR_BS_EXTLBA;
 	/* Look at what is installed */
 	ofl = mbr.mbrb.mbrbs_flags;
 	if (ofl == 0) {
 		/* Check there is some bootcode at all... */
 		if (mbr.mbr.mbr_magic != htole16(MBR_MAGIC) ||
 		    mbr.mbr.mbr_jmpboot[0] == 0 ||
 		    mbr_root_above_chs())
 			/* Existing won't do, force update */
 			fl |= MBR_BS_NEWMBR;
+	}
 	ofl = mbr.oflags & (MBR_BS_ACTIVE | MBR_BS_EXTLBA);
 	if (fl & ~ofl || (fl == 0 && ofl & MBR_BS_ACTIVE)) {
 		/* Existing boot code isn't the right one... */
 		if (fl & MBR_BS_ACTIVE)
 			msg_display(MSG_installbootsel);
 		else
 			msg_display(MSG_installmbr);
 	} else
 		/* Existing code would (probably) be ok */
 		msg_display(MSG_updatembr);
 	if (!ask_yesno(NULL))
 		/* User doesn't want to update mbr code */
 		return 1;
 	if (md_read_bootcode(bootcode, &mbr.mbr) == 0)
 		/* update suceeded - to memory copy */
 		return 1;
 	/* This shouldn't happen since the files are in the floppy fs... */
 	msg_display("Can't find %s", bootcode);
 	ask_yesno(NULL);
 	return 1;
+}
 /*
  * md back-end code for menu-driven BSD disklabel editor.
  */
 int
 md_make_bsd_partitions(void)
+{
 	return make_bsd_partitions();
+}
 /*
  * any additional partition validation
  */
 int
 md_check_partitions(void)
+{
 	int rval;
 	char *bootxx;
 	/* check we have boot code for the root partition type */
 	bootxx = bootxx_name();
 	rval = access(bootxx, R_OK);
 	free(bootxx);
 	if (rval == 0)
 		return 1;
 	process_menu(MENU_ok, __UNCONST(MSG_No_Bootcode));
 	return 0;
+}
 /*
  * hook called before writing new disklabel.
  */
 int
 md_pre_disklabel(void)
+{
 	if (pm->no_mbr)
 		return 0;
 	msg_display(MSG_dofdisk);
 	/* write edited MBR onto disk. */
 	if (write_mbr(pm->diskdev, &mbr, 1) != 0) {
 		msg_display(MSG_wmbrfail);
 		process_menu(MENU_ok, NULL);
 		return 1;
+	}
 	return 0;
+}
 /*
  * hook called after writing disklabel to new target disk.
  */
 int
 md_post_disklabel(void)
+{
 	return 0;
+}
 /*
  * hook called after upgrade() or 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(void)
+{
 	int ret;
 	size_t len;
 	char boot_options[1024];
 	char *bootxx_filename;
 	/*
 	 * XXX - this code retains a lot of cruft from when we went
 	 * to great pains to exclude installboot from the ramdisk
 	 * for size reasons and should be rewritten.
 	 */
 	static const char *consoles[]={
         	"pc", /* CONSDEV_PC */
 		"com0", /* CONSDEV_COM0 */
 		"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);
+		}
                 free(bootxx_filename);
         } else
                 ret = -1;
         if (ret != 0)
                 process_menu(MENU_ok,
                     __UNCONST("Warning: disk is probably not bootable"));
 	return ret;
+}
 int
 md_post_extract(void)
+{
 	return 0;
+}
 void
 md_cleanup_install(void)
+{
 #ifndef DEBUG
 	enable_rc_conf();
 	add_rc_conf("wscons=YES\n");
 # if defined(__i386__) && defined(SET_KERNEL_TINY)
 	/*
 	 * For GENERIC_TINY, do not enable any extra screens or wsmux.
 	 * Otherwise, run getty on 4 VTs.
 	 */
 	if (get_kernel_set() == SET_KERNEL_TINY)
 		run_program(RUN_CHROOT,
                             "sed -an -e '/^screen/s/^/#/;/^mux/s/^/#/;"
 			    "H;$!d;g;w /etc/wscons.conf' /etc/wscons.conf");
 	else
 # endif
 		run_program(RUN_CHROOT,
 			    "sed -an -e '/^ttyE[1-9]/s/off/on/;"
 			    "H;$!d;g;w /etc/ttys' /etc/ttys");
 #endif
+}
 int
 md_pre_update(void)
+{
 	return 1;
+}
 /* Upgrade support */
 int
 md_update(void)
+{
 	md_post_newfs();
 	md_upgrade_mbrtype();
 	return 1;
+}
 int
 md_check_mbr(mbr_info_t *mbri)
+{
 	return 2;
+}
 int
 md_mbr_use_wholedisk(mbr_info_t *mbri)
+{
 	return mbr_use_wholedisk(mbri);
+}
 static int
 get_bios_info(char *dev)
+{
 	static struct disklist *disklist = NULL;
 	static int mib[2] = {CTL_MACHDEP, CPU_DISKINFO};
 	int i;
 	size_t len;
 	struct biosdisk_info *bip;
 	struct nativedisk_info *nip = NULL, *nat;
 	int cyl, head;
 	daddr_t sec;
 	if (disklist == NULL) {
 		if (sysctl(mib, 2, NULL, &len, NULL, 0) < 0)
 			goto nogeom;
 		disklist = malloc(len);
 		if (disklist == NULL) {
 			fprintf(stderr, "Out of memory\n");
 			return -1;
+		}
 		sysctl(mib, 2, disklist, &len, NULL, 0);
+	}
 	for (i = 0; i < disklist->dl_nnativedisks; i++) {
 		nat = &disklist->dl_nativedisks[i];
 		if (!strcmp(dev, nat->ni_devname)) {
 			nip = nat;
 			break;
+		}
+	}
 	if (nip == NULL || nip->ni_nmatches == 0) {
 nogeom:
 		if (nip != NULL)
 			msg_display(MSG_nobiosgeom, pm->dlcyl, pm->dlhead, pm->dlsec);
 		if (guess_biosgeom_from_mbr(&mbr, &cyl, &head, &sec) >= 0
 		    && nip != NULL)
 			msg_display_add(MSG_biosguess, cyl, head, sec);
 		biosdisk = NULL;
 	} else {
 		guess_biosgeom_from_mbr(&mbr, &cyl, &head, &sec);
 		if (nip->ni_nmatches == 1) {
 			bip = &disklist->dl_biosdisks[nip->ni_biosmatches[0]];
 			msg_display(MSG_onebiosmatch);
 			msg_table_add(MSG_onebiosmatch_header);
 			msg_table_add(MSG_onebiosmatch_row, bip->bi_dev,
 			    bip->bi_cyl, bip->bi_head, bip->bi_sec,
 			    (unsigned)bip->bi_lbasecs,
 			    (unsigned)(bip->bi_lbasecs / (1000000000 / 512)));
 			msg_display_add(MSG_biosgeom_advise);
 			biosdisk = bip;
 			process_menu(MENU_biosonematch, &biosdisk);
 		} else {
 			msg_display(MSG_biosmultmatch);
 			msg_table_add(MSG_biosmultmatch_header);
 			for (i = 0; i < nip->ni_nmatches; i++) {
 				bip = &disklist->dl_biosdisks[
 							nip->ni_biosmatches[i]];
 				msg_table_add(MSG_biosmultmatch_row, i,
 				    bip->bi_dev, bip->bi_cyl, bip->bi_head,
 				    bip->bi_sec, (unsigned)bip->bi_lbasecs,
 				    (unsigned)bip->bi_lbasecs/(1000000000/512));
+			}
 			process_menu(MENU_biosmultmatch, &i);
 			if (i == -1)
 				biosdisk = NULL;
 			else
 				biosdisk = &disklist->dl_biosdisks[
 							nip->ni_biosmatches[i]];
+		}
+	}
 	if (biosdisk == NULL) {
 		if (nip != NULL) {
 			set_bios_geom(cyl, head, sec);
 		} else {
 			bcyl = cyl;
 			bhead = head;
 			bsec = sec;
+		}
 	} else {
 		bcyl = biosdisk->bi_cyl;
 		bhead = biosdisk->bi_head;
 		bsec = biosdisk->bi_sec;
+	}
 	return 0;
+}
 static int
 mbr_root_above_chs(void)
+{
 	return pm->ptstart + DEFROOTSIZE * (MEG / 512) >= bcyl * bhead * bsec;
+}
 static void
 md_upgrade_mbrtype(void)
+{
 	struct mbr_partition *mbrp;
 	int i, netbsdpart = -1, oldbsdpart = -1, oldbsdcount = 0;
 	if (pm->no_mbr)
 		return;
 	if (read_mbr(pm->diskdev, &mbr) < 0)
 		return;
 	mbrp = &mbr.mbr.mbr_parts[0];
 	for (i = 0; i < MBR_PART_COUNT; i++) {
 		if (mbrp[i].mbrp_type == MBR_PTYPE_386BSD) {
 			oldbsdpart = i;
 			oldbsdcount++;
 		} else if (mbrp[i].mbrp_type == MBR_PTYPE_NETBSD)
 			netbsdpart = i;
+	}
 	if (netbsdpart == -1 && oldbsdcount == 1) {
 		mbrp[oldbsdpart].mbrp_type = MBR_PTYPE_NETBSD;
 		write_mbr(pm->diskdev, &mbr, 0);
+	}
+}
 /*
  * Read MBR code from a file.
  * The existing partition table and bootselect configuration is kept.
  */
 static int
 md_read_bootcode(const char *path, struct mbr_sector *mbrs)
+{
 	int fd;
 	struct stat st;
 	size_t len;
 	struct mbr_sector new_mbr;
 	uint32_t dsn;
 	fd = open(path, O_RDONLY);
 	if (fd < 0)
 		return -1;
 	if (fstat(fd, &st) < 0 || st.st_size != sizeof *mbrs) {
 		close(fd);
 		return -1;
+	}
 	if (read(fd, &new_mbr, sizeof new_mbr) != sizeof new_mbr) {
 		close(fd);
 		return -1;
+	}
 	close(fd);
 	if (new_mbr.mbr_bootsel_magic != htole16(MBR_BS_MAGIC))
 		return -1;
 	if (mbrs->mbr_bootsel_magic == htole16(MBR_BS_MAGIC)) {
 		len = offsetof(struct mbr_sector, mbr_bootsel);
 	} else
 		len = offsetof(struct mbr_sector, mbr_parts);
 	/* Preserve the 'drive serial number' - especially for Vista */
 	dsn = mbrs->mbr_dsn;
 	memcpy(mbrs, &new_mbr, len);
 	mbrs->mbr_dsn = dsn;
 	/* Keep flags from object file - indicate the properties */
 	mbrs->mbr_bootsel.mbrbs_flags = new_mbr.mbr_bootsel.mbrbs_flags;
 	mbrs->mbr_magic = htole16(MBR_MAGIC);
 	return 0;
+}
 static unsigned int
 get_bootmodel(void)
+{
 #if defined(__i386__)
 	struct utsname ut;
 #ifdef DEBUG
 	char *envstr;
 	envstr = getenv("BOOTMODEL");
 	if (envstr != NULL)
 		return atoi(envstr);
 #endif
 	if (uname(&ut) < 0)
 		ut.version[0] = 0;
 #if defined(SET_KERNEL_TINY)
 	if (strstr(ut.version, "TINY") != NULL)
 		return SET_KERNEL_TINY;
 #endif
 #if defined(SET_KERNEL_PS2)
 	if (strstr(ut.version, "PS2") != NULL)
 		return SET_KERNEL_PS2;
 #endif
 #endif
 	return SET_KERNEL_GENERIC;
+}
 int
 md_pre_mount()
+{
 	return 0;
+}