 @@ -1,14 +1,14 @@
-/*	$NetBSD: defs.h,v 1.5 2014/10/14 16:35:20 christos Exp $	*/
+/*	$NetBSD: defs.h,v 1.6 2015/01/02 19:43:13 abs 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
 @@ -441,26 +441,27 @@ int	md_update(void);
 /* 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 *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: disks.c,v 1.6 2014/12/28 12:05:27 martin Exp $ */
+/*	$NetBSD: disks.c,v 1.7 2015/01/02 19:43:13 abs 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
 @@ -1203,26 +1203,33 @@ mount_disks(void)
 	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);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: install.c,v 1.2 2014/08/03 16:09:38 martin Exp $	*/
+/*	$NetBSD: install.c,v 1.3 2015/01/02 19:43:13 abs 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
 @@ -91,26 +91,27 @@ do_install(void)
 			return;
+		}
 		/* Last chance ... do you really want to do this? */
 		clear();
 		refresh();
 		msg_display(MSG_lastchance, pm->diskdev);
 		process_menu(MENU_noyes, NULL);
 		if (!yesno)
 			return;
 		if (md_pre_disklabel() != 0 ||
 			write_disklabel() != 0 ||
                         set_swap_if_low_ram(pm->diskdev, pm->bsdlabel) != 0 ||
 			md_post_disklabel() != 0 ||
 			make_filesystems() ||
 			make_fstab() != 0 ||
 			md_post_newfs() != 0)
 			return;
+	}
 	/* Unpack the distribution. */
 	process_menu(MENU_distset, &retcode);
 	if (retcode == 0)
 		return;
 	if (get_and_unpack_sets(0, MSG_disksetupdone,
 	    MSG_extractcomplete, MSG_abortinst) != 0)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: upgrade.c,v 1.2 2014/08/03 16:09:38 martin Exp $	*/
+/*	$NetBSD: upgrade.c,v 1.3 2015/01/02 19:43:13 abs 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
 @@ -57,26 +57,29 @@ do_upgrade(void)
 	int retcode = 0;
 	partman_go = 0;
 	msg_display(MSG_upgradeusure);
 	process_menu(MENU_noyes, NULL);
 	if (!yesno)
 		return;
 	get_ramsize();
 	if (find_disks(msg_string(MSG_upgrade)) < 0)
 		return;
         if (set_swap_if_low_ram(pm->diskdev, NULL) < 0)
 		return;
 	if (md_pre_update() < 0)
 		return;
 	if (mount_disks() != 0)
 		return;
 	/*
 	 * Save X symlink, ...
 	 */
 	if (save_X("/usr/X11R6"))
 		return;
 	if (save_X("/usr/X11R7"))

 @@ -1,14 +1,14 @@
-/*	$NetBSD: partman.c,v 1.7 2014/10/18 08:33:31 snj Exp $ */
+/*	$NetBSD: partman.c,v 1.8 2015/01/02 19:43:13 abs Exp $ */
 /*
  * Copyright 2012 Eugene Lozovoy
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -2291,26 +2291,27 @@ pm_commit(menudesc *m, void *arg)
 		if (pm_i->isspecial) {
 			if (make_filesystems() != 0) {
 				if (logfp)
 					fprintf(logfp, "Special disk %s preparing error\n", pm_i->diskdev);
 				continue;
+			}
 			pm_i->unsaved = 0;
 		} else if (! pm_i->gpt) {
 #ifndef NO_DISKLABEL
 			savenewlabel(pm_i->bsdlabel, MAXPARTITIONS);
 #endif
 			if (
 				write_disklabel() != 0   || /* Write slices table (disklabel) */
                                 set_swap_if_low_ram(pm->diskdev, pm->bsdlabel) != 0 ||
 				md_post_disklabel() != 0 || /* Enable swap and check badblock */
 				make_filesystems() != 0     /* Create filesystems with newfs */
 			) {
 				/* Oops, something failed... */
 				if (logfp)
 					fprintf(logfp, "Disk %s preparing error\n", pm_i->diskdev);
 				continue;
+			}
 			pm_i->unsaved = 0;
+		}
+	}
 	/* Call all functions that may create new devices */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: md.c,v 1.2 2014/08/03 16:09:39 martin Exp $ */
+/*	$NetBSD: md.c,v 1.3 2015/01/02 19:43:13 abs 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.
 @@ -237,28 +237,26 @@ md_pre_disklabel(void)
 		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)
+{
 	if (get_ramsize() <= 32)
 		set_swap(pm->diskdev, pm->bsdlabel);
 	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)
+{
 	if (!nobootfs) {
 		msg_display(msg_string(MSG_copybootloader), pm->diskdev);
 @@ -281,29 +279,26 @@ md_cleanup_install(void)
 	enable_rc_conf();
 #endif
 	msg_display(MSG_howtoboot);
 	process_menu(MENU_ok, NULL);
+}
 int
 md_pre_update(void)
+{
 	struct mbr_partition *part;
 	mbr_info_t *ext;
 	int i;
 	if (get_ramsize() <= 32)
 		set_swap(pm->diskdev, NULL);
 	read_mbr(pm->diskdev, &mbr);
 	/* do a sanity check of the partition table */
 	for (ext = &mbr; ext; ext = ext->extended) {
 		part = ext->mbr.mbr_parts;
 		for (i = 0; i < MBR_PART_COUNT; part++, i++) {
 			if (part->mbrp_type != MBR_PTYPE_FAT12)
 				continue;
 			if (part->mbrp_size < (MIN_FAT12_BOOT / 512)) {
 				msg_display(MSG_boottoosmall);
 				msg_display_add(MSG_nobootpart, 0);
 				process_menu(MENU_yesno, NULL);
 				if (!yesno)
 					return 0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: md.c,v 1.2 2014/08/03 16:09:39 martin Exp $ */
+/*	$NetBSD: md.c,v 1.3 2015/01/02 19:43:13 abs 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.
 @@ -238,29 +238,26 @@ md_pre_disklabel(void)
 		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)
+{
 	if (get_ramsize() <= 32)
 		set_swap(pm->diskdev, pm->bsdlabel);
 	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)
+{
 	static const char *kernels[] = {
 		"vmlinux-nfsroot.gz",
 @@ -300,29 +297,26 @@ md_cleanup_install(void)
+{
 #ifndef DEBUG
 	enable_rc_conf();
 #endif
+}
 int
 md_pre_update(void)
+{
 	struct mbr_partition *part;
 	mbr_info_t *ext;
 	int i;
 	if (get_ramsize() <= 32)
 		set_swap(pm->diskdev, NULL);
 	read_mbr(pm->diskdev, &mbr);
 	/* do a sanity check of the partition table */
 	for (ext = &mbr; ext; ext = ext->extended) {
 		part = ext->mbr.mbr_parts;
 		for (i = 0; i < MBR_PART_COUNT; part++, i++) {
 			if (part->mbrp_type != MBR_PTYPE_LNXEXT2)
 				continue;
 			if (part->mbrp_size < (MIN_EXT2FS_BOOT / 512)) {
 				msg_display(MSG_boottoosmall);
 				msg_display_add(MSG_nobootpart, 0);
 				process_menu(MENU_yesno, NULL);
 				if (!yesno)
 					return 0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: md.c,v 1.2 2014/08/03 16:09:39 martin Exp $	*/
+/*	$NetBSD: md.c,v 1.3 2015/01/02 19:43:13 abs 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.
 @@ -96,27 +96,26 @@ md_get_info(void)
 int
 md_pre_disklabel(void)
+{
 	return 0;
+}
 /*
  * hook called after writing disklabel to new target disk.
  */
 int
 md_post_disklabel(void)
+{
 	return 0;
+}
 /*
  * MD 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, so that if power fails, they can
  * continue installation by booting the target disk and doing an
  * `upgrade'.
  */
 int
 md_post_newfs(void)
+{

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: md.c,v 1.2 2014/08/03 16:09:39 martin Exp $ */	1	/* $NetBSD: md.c,v 1.3 2015/01/02 19:43:13 abs Exp $ */
2		2
3	/*	3	/*
4	* Copyright 1997 Piermont Information Systems Inc.	4	* Copyright 1997 Piermont Information Systems Inc.
5	* All rights reserved.	5	* All rights reserved.
6	*	6	*
7	* Based on code written by Philip A. Nelson for Piermont Information	7	* Based on code written by Philip A. Nelson for Piermont Information
8	* Systems Inc.	8	* Systems Inc.
9	*	9	*
10	* Redistribution and use in source and binary forms, with or without	10	* Redistribution and use in source and binary forms, with or without
11	* modification, are permitted provided that the following conditions	11	* modification, are permitted provided that the following conditions
12	* are met:	12	* are met:
13	* 1. Redistributions of source code must retain the above copyright	13	* 1. Redistributions of source code must retain the above copyright
14	* notice, this list of conditions and the following disclaimer.	14	* notice, this list of conditions and the following disclaimer.
	@@ -166,29 +166,26 @@ md_check_partitions(void)		@@ -166,29 +166,26 @@ md_check_partitions(void)
166	*/	166	*/
167	int	167	int
168	md_pre_disklabel(void)	168	md_pre_disklabel(void)
169	{	169	{
170	return 0;	170	return 0;
171	}	171	}
172		172
173	/*	173	/*
174	* hook called after writing disklabel to new target disk.	174	* hook called after writing disklabel to new target disk.
175	*/	175	*/
176	int	176	int
177	md_post_disklabel(void)	177	md_post_disklabel(void)
178	{	178	{
179	if (get_ramsize() < 6)
180	set_swap(pm->diskdev, pm->bsdlabel);
181
182	return 0;	179	return 0;
183	}	180	}
184		181
185	/*	182	/*
186	* hook called after upgrade() or install() has finished setting	183	* hook called after upgrade() or install() has finished setting
187	* up the target disk but immediately before the user is given the	184	* up the target disk but immediately before the user is given the
188	* ``disks are now set up'' message.	185	* ``disks are now set up'' message.
189	*	186	*
190	* On hp300, we use this opportunity to install the boot blocks.	187	* On hp300, we use this opportunity to install the boot blocks.
191	*/	188	*/
192	int	189	int
193	md_post_newfs(void)	190	md_post_newfs(void)
194	{	191	{
	@@ -208,28 +205,26 @@ md_post_extract(void)		@@ -208,28 +205,26 @@ md_post_extract(void)
208	}	205	}
209		206
210	void	207	void
211	md_cleanup_install(void)	208	md_cleanup_install(void)
212	{	209	{
213	#ifdef notyet /* sed is too large for ramdisk */	210	#ifdef notyet /* sed is too large for ramdisk */
214	enable_rc_conf();	211	enable_rc_conf();
215	#endif	212	#endif
216	}	213	}
217		214
218	int	215	int
219	md_pre_update(void)	216	md_pre_update(void)
220	{	217	{
221	if (get_ramsize() < 6)
222	set_swap(pm->diskdev, NULL);
223	return 1;	218	return 1;
224	}	219	}
225		220
226	/* Upgrade support */	221	/* Upgrade support */
227	int	222	int
228	md_update(void)	223	md_update(void)
229	{	224	{
230	md_post_newfs();	225	md_post_newfs();
231	return 1;	226	return 1;
232	}	227	}
233		228
234	/*	229	/*
235	* Used in bsddisklabel.c as BOOT_SIZE	230	* Used in bsddisklabel.c as BOOT_SIZE

 @@ -1,14 +1,14 @@
-/*	$NetBSD: md.c,v 1.2 2014/08/03 16:09:39 martin Exp $	*/
+/*	$NetBSD: md.c,v 1.3 2015/01/02 19:43:13 abs 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.
 @@ -100,27 +100,26 @@ md_pre_disklabel(void)
 		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)
+{
 	return 0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: md.c,v 1.4 2014/10/11 13:34:01 gson Exp $ */
+/*	$NetBSD: md.c,v 1.5 2015/01/02 19:43:13 abs 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.
 @@ -275,29 +275,26 @@ md_pre_disklabel(void)
 		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)
+{
 	if (get_ramsize() <= 32)
 		set_swap(pm->diskdev, pm->bsdlabel);
 	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;
 @@ -398,28 +395,26 @@ md_cleanup_install(void)
 			    "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)
+{
 	if (get_ramsize() <= 8)
 		set_swap(pm->diskdev, NULL);
 	return 1;
+}
 /* Upgrade support */
 int
 md_update(void)
+{
 	md_post_newfs();
 	md_upgrade_mbrtype();
 	return 1;
+}
 int

 @@ -1,14 +1,14 @@
-/*	$NetBSD: md.c,v 1.3 2014/08/04 08:59:28 martin Exp $	*/
+/*	$NetBSD: md.c,v 1.4 2015/01/02 19:43:13 abs 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.
 @@ -144,30 +144,26 @@ md_check_partitions(void)
 int
 md_pre_disklabel(void)
+{
 	return 0;
+}
 /*
  * hook called after writing disklabel to new target disk.
  */
 int
 md_post_disklabel(void)
+{
 	if (get_ramsize() <= 32)
 		set_swap(pm->diskdev, pm->bsdlabel);
 	return 0;
+}
 static int
 copy_bootloader(void)
+{
 	const char *mntdir = "/mnt2";
 	msg_display(MSG_copybootloader, pm->diskdev);
 	if (!run_program(RUN_SILENT | RUN_ERROR_OK,
 	    "mount /dev/%s%c %s", pm->diskdev, 'a' + PART_BOOT, mntdir)) {
 		mnt2_mounted = 1;
 		run_program(0, "/bin/cp /usr/mdec/boot %s", mntdir);
 @@ -207,30 +203,26 @@ void
 md_cleanup_install(void)
+{
 #ifndef DEBUG
 	enable_rc_conf();
 #endif
 	msg_display(MSG_howtoboot);
 	process_menu(MENU_ok, NULL);
+}
 int
 md_pre_update(void)
+{
 	if (get_ramsize() <= 32)
 		set_swap(pm->diskdev, pm->bsdlabel);
 	return 1;
+}
 /* Upgrade support */
 int
 md_update(void)
+{
 	const char *mntdir = "/mnt2";
 	char bootpath[MAXPATHLEN];
 	struct stat sb;
 	bool hasboot = false;
 	/*

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: md.c,v 1.2 2014/08/03 16:09:40 martin Exp $ */	1	/* $NetBSD: md.c,v 1.3 2015/01/02 19:43:13 abs Exp $ */
2		2
3	/*	3	/*
4	* Copyright 1997 Piermont Information Systems Inc.	4	* Copyright 1997 Piermont Information Systems Inc.
5	* All rights reserved.	5	* All rights reserved.
6	*	6	*
7	* Based on code written by Philip A. Nelson for Piermont Information	7	* Based on code written by Philip A. Nelson for Piermont Information
8	* Systems Inc.	8	* Systems Inc.
9	*	9	*
10	* Redistribution and use in source and binary forms, with or without	10	* Redistribution and use in source and binary forms, with or without
11	* modification, are permitted provided that the following conditions	11	* modification, are permitted provided that the following conditions
12	* are met:	12	* are met:
13	* 1. Redistributions of source code must retain the above copyright	13	* 1. Redistributions of source code must retain the above copyright
14	* notice, this list of conditions and the following disclaimer.	14	* notice, this list of conditions and the following disclaimer.
	@@ -164,29 +164,26 @@ md_check_partitions(void)		@@ -164,29 +164,26 @@ md_check_partitions(void)
164	*/	164	*/
165	int	165	int
166	md_pre_disklabel(void)	166	md_pre_disklabel(void)
167	{	167	{
168	return 0;	168	return 0;
169	}	169	}
170		170
171	/*	171	/*
172	* hook called after writing disklabel to new target disk.	172	* hook called after writing disklabel to new target disk.
173	*/	173	*/
174	int	174	int
175	md_post_disklabel(void)	175	md_post_disklabel(void)
176	{	176	{
177	if (get_ramsize() < 6)
178	set_swap(pm->diskdev, pm->bsdlabel);
179
180	return 0;	177	return 0;
181	}	178	}
182		179
183	/*	180	/*
184	* hook called after upgrade() or install() has finished setting	181	* hook called after upgrade() or install() has finished setting
185	* up the target disk but immediately before the user is given the	182	* up the target disk but immediately before the user is given the
186	* ``disks are now set up'' message..	183	* ``disks are now set up'' message..
187	*	184	*
188	* On mvme68k, we use this opportunity to install the boot blocks.	185	* On mvme68k, we use this opportunity to install the boot blocks.
189	*/	186	*/
190	int	187	int
191	md_post_newfs(void)	188	md_post_newfs(void)
192	{	189	{
	@@ -209,28 +206,26 @@ md_post_extract(void)		@@ -209,28 +206,26 @@ md_post_extract(void)
209	}	206	}
210		207
211	void	208	void
212	md_cleanup_install(void)	209	md_cleanup_install(void)
213	{	210	{
214	#ifdef notyet /* sed is too large for ramdisk */	211	#ifdef notyet /* sed is too large for ramdisk */
215	enable_rc_conf();	212	enable_rc_conf();
216	#endif	213	#endif
217	}	214	}
218		215
219	int	216	int
220	md_pre_update(void)	217	md_pre_update(void)
221	{	218	{
222	if (get_ramsize() < 6)
223	set_swap(pm->diskdev, NULL);
224	return 1;	219	return 1;
225	}	220	}
226		221
227	/* Upgrade support */	222	/* Upgrade support */
228	int	223	int
229	md_update(void)	224	md_update(void)
230	{	225	{
231	md_post_newfs();	226	md_post_newfs();
232	return 1;	227	return 1;
233	}	228	}
234		229
235	int	230	int
236	md_pre_mount()	231	md_pre_mount()

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: md.c,v 1.2 2014/08/03 16:09:40 martin Exp $ */	1	/* $NetBSD: md.c,v 1.3 2015/01/02 19:43:13 abs Exp $ */
2		2
3	/*	3	/*
4	* Copyright 1997 Piermont Information Systems Inc.	4	* Copyright 1997 Piermont Information Systems Inc.
5	* All rights reserved.	5	* All rights reserved.
6	*	6	*
7	* Based on code written by Philip A. Nelson for Piermont Information	7	* Based on code written by Philip A. Nelson for Piermont Information
8	* Systems Inc.	8	* Systems Inc.
9	*	9	*
10	* Redistribution and use in source and binary forms, with or without	10	* Redistribution and use in source and binary forms, with or without
11	* modification, are permitted provided that the following conditions	11	* modification, are permitted provided that the following conditions
12	* are met:	12	* are met:
13	* 1. Redistributions of source code must retain the above copyright	13	* 1. Redistributions of source code must retain the above copyright
14	* notice, this list of conditions and the following disclaimer.	14	* notice, this list of conditions and the following disclaimer.
	@@ -129,27 +129,26 @@ md_check_partitions(void)		@@ -129,27 +129,26 @@ md_check_partitions(void)
129	int	129	int
130	md_pre_disklabel(void)	130	md_pre_disklabel(void)
131	{	131	{
132		132
133	return 0;	133	return 0;
134	}	134	}
135		135
136	/*	136	/*
137	* hook called after writing disklabel to new target disk.	137	* hook called after writing disklabel to new target disk.
138	*/	138	*/
139	int	139	int
140	md_post_disklabel(void)	140	md_post_disklabel(void)
141	{	141	{
142
143	return 0;	142	return 0;
144	}	143	}
145		144
146	/*	145	/*
147	* hook called after upgrade() or install() has finished setting	146	* hook called after upgrade() or install() has finished setting
148	* up the target disk but immediately before the user is given the	147	* up the target disk but immediately before the user is given the
149	* ``disks are now set up'' message.	148	* ``disks are now set up'' message.
150	*	149	*
151	* On the news68k, we use this opportunity to install the boot blocks.	150	* On the news68k, we use this opportunity to install the boot blocks.
152	*/	151	*/
153	int	152	int
154	md_post_newfs(void)	153	md_post_newfs(void)
155	{	154	{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: md.c,v 1.2 2014/08/03 16:09:40 martin Exp $	*/
+/*	$NetBSD: md.c,v 1.3 2015/01/02 19:43:13 abs 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.
 @@ -146,27 +146,26 @@ md_check_partitions(void)
  */
 int
 md_pre_disklabel(void)
+{
 	return 0;
+}
 /*
  * hook called after writing disklabel to new target disk.
  */
 int
 md_post_disklabel(void)
+{
 	set_swap(pm->diskdev, pm->bsdlabel);
     if (strstr(instsys.version, "(INSTALL32_IP3x)"))
 		return run_program(RUN_DISPLAY,
 		    "%s %s", "/usr/mdec/sgivol -f -w boot /usr/mdec/ip3xboot",
 		    pm->diskdev);
 	if (strstr(instsys.version, "(INSTALL32_IP2x)")) {
 		run_program(RUN_DISPLAY,
 		  "%s %s", "/usr/mdec/sgivol -f -w aoutboot /usr/mdec/aoutboot",
 		  pm->diskdev);
 		return run_program(RUN_DISPLAY,
 		  "%s %s", "/usr/mdec/sgivol -f -w boot /usr/mdec/ip2xboot",
 		  pm->diskdev);
+	}

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: md.c,v 1.2 2014/08/03 16:09:41 martin Exp $ */	1	/* $NetBSD: md.c,v 1.3 2015/01/02 19:43:14 abs Exp $ */
2		2
3	/*	3	/*
4	* Copyright 1997 Piermont Information Systems Inc.	4	* Copyright 1997 Piermont Information Systems Inc.
5	* All rights reserved.	5	* All rights reserved.
6	*	6	*
7	* Based on code written by Philip A. Nelson for Piermont Information	7	* Based on code written by Philip A. Nelson for Piermont Information
8	* Systems Inc.	8	* Systems Inc.
9	*	9	*
10	* Redistribution and use in source and binary forms, with or without	10	* Redistribution and use in source and binary forms, with or without
11	* modification, are permitted provided that the following conditions	11	* modification, are permitted provided that the following conditions
12	* are met:	12	* are met:
13	* 1. Redistributions of source code must retain the above copyright	13	* 1. Redistributions of source code must retain the above copyright
14	* notice, this list of conditions and the following disclaimer.	14	* notice, this list of conditions and the following disclaimer.
	@@ -133,29 +133,26 @@ md_check_partitions(void)		@@ -133,29 +133,26 @@ md_check_partitions(void)
133	*/	133	*/
134	int	134	int
135	md_pre_disklabel(void)	135	md_pre_disklabel(void)
136	{	136	{
137	return 0;	137	return 0;
138	}	138	}
139		139
140	/*	140	/*
141	* hook called after writing disklabel to new target disk.	141	* hook called after writing disklabel to new target disk.
142	*/	142	*/
143	int	143	int
144	md_post_disklabel(void)	144	md_post_disklabel(void)
145	{	145	{
146	if (get_ramsize() <= 32)
147	set_swap(pm->diskdev, pm->bsdlabel);
148
149	return 0;	146	return 0;
150	}	147	}
151		148
152	/*	149	/*
153	* hook called after upgrade() or install() has finished setting	150	* hook called after upgrade() or install() has finished setting
154	* up the target disk but immediately before the user is given the	151	* up the target disk but immediately before the user is given the
155	* ``disks are now set up'' message.	152	* ``disks are now set up'' message.
156	*	153	*
157	* On the vax, we use this opportunity to install the boot blocks.	154	* On the vax, we use this opportunity to install the boot blocks.
158	*/	155	*/
159	int	156	int
160	md_post_newfs(void)	157	md_post_newfs(void)
161	{	158	{
	@@ -172,29 +169,26 @@ md_post_extract(void)		@@ -172,29 +169,26 @@ md_post_extract(void)
172	}	169	}
173		170
174	void	171	void
175	md_cleanup_install(void)	172	md_cleanup_install(void)
176	{	173	{
177	#ifndef DEBUG	174	#ifndef DEBUG
178	enable_rc_conf();	175	enable_rc_conf();
179	#endif	176	#endif
180	}	177	}
181		178
182	int	179	int
183	md_pre_update(void)	180	md_pre_update(void)
184	{	181	{
185	if (get_ramsize() <= 32)
186	set_swap(pm->diskdev, NULL);
187
188	return 1;	182	return 1;
189	}	183	}
190		184
191	/* Upgrade support */	185	/* Upgrade support */
192	int	186	int
193	md_update(void)	187	md_update(void)
194	{	188	{
195	md_post_newfs();	189	md_post_newfs();
196	return 1;	190	return 1;
197	}	191	}
198		192
199	int	193	int
200	md_pre_mount()	194	md_pre_mount()

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: md.c,v 1.2 2014/08/03 16:09:41 martin Exp $ */	1	/* $NetBSD: md.c,v 1.3 2015/01/02 19:43:14 abs Exp $ */
2		2
3	/*	3	/*
4	* Copyright 1997 Piermont Information Systems Inc.	4	* Copyright 1997 Piermont Information Systems Inc.
5	* All rights reserved.	5	* All rights reserved.
6	*	6	*
7	* Based on code written by Philip A. Nelson for Piermont Information	7	* Based on code written by Philip A. Nelson for Piermont Information
8	* Systems Inc. Modified by Minoura Makoto for x68k.	8	* Systems Inc. Modified by Minoura Makoto for x68k.
9	*	9	*
10	* Redistribution and use in source and binary forms, with or without	10	* Redistribution and use in source and binary forms, with or without
11	* modification, are permitted provided that the following conditions	11	* modification, are permitted provided that the following conditions
12	* are met:	12	* are met:
13	* 1. Redistributions of source code must retain the above copyright	13	* 1. Redistributions of source code must retain the above copyright
14	* notice, this list of conditions and the following disclaimer.	14	* notice, this list of conditions and the following disclaimer.
	@@ -252,28 +252,26 @@ int		@@ -252,28 +252,26 @@ int
252	md_pre_disklabel(void)	252	md_pre_disklabel(void)
253	{	253	{
254	if (md_need_newdisk)	254	if (md_need_newdisk)
255	md_newdisk ();	255	md_newdisk ();
256	return 0;	256	return 0;
257	}	257	}
258		258
259	/*	259	/*
260	* hook called after writing disklabel to new target disk.	260	* hook called after writing disklabel to new target disk.
261	*/	261	*/
262	int	262	int
263	md_post_disklabel(void)	263	md_post_disklabel(void)
264	{	264	{
265	if (get_ramsize() < 6)
266	set_swap(pm->diskdev, pm->bsdlabel);
267	return 0;	265	return 0;
268	}	266	}
269		267
270	/*	268	/*
271	* hook called after upgrade() or install() has finished setting	269	* hook called after upgrade() or install() has finished setting
272	* up the target disk but immediately before the user is given the	270	* up the target disk but immediately before the user is given the
273	* ``disks are now set up'' message.	271	* ``disks are now set up'' message.
274	*	272	*
275	* On the x68k, we use this opportunity to install the boot blocks.	273	* On the x68k, we use this opportunity to install the boot blocks.
276	*/	274	*/
277	int	275	int
278	md_post_newfs(void)	276	md_post_newfs(void)
279	{	277	{
	@@ -295,28 +293,26 @@ md_post_extract(void)		@@ -295,28 +293,26 @@ md_post_extract(void)
295	}	293	}
296		294
297	void	295	void
298	md_cleanup_install(void)	296	md_cleanup_install(void)
299	{	297	{
300	#ifndef DEBUG	298	#ifndef DEBUG
301	enable_rc_conf();	299	enable_rc_conf();
302	#endif	300	#endif
303	}	301	}
304		302
305	int	303	int
306	md_pre_update(void)	304	md_pre_update(void)
307	{	305	{
308	if (get_ramsize() < 6)
309	set_swap(pm->diskdev, NULL);
310	return 1;	306	return 1;
311	}	307	}
312		308
313	/* Upgrade support */	309	/* Upgrade support */
314	int	310	int
315	md_update(void)	311	md_update(void)
316	{	312	{
317	md_post_newfs();	313	md_post_newfs();
318	return 1;	314	return 1;
319	}	315	}
320		316
321	static int	317	static int
322	md_newdisk(void)	318	md_newdisk(void)