	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: md.c,v 1.21 2008/01/28 02:47:13 rumble Exp $ */	1	/* $NetBSD: md.c,v 1.22 2008/10/07 09:58: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.
	@@ -320,30 +320,26 @@ md_update(void)		@@ -320,30 +320,26 @@ md_update(void)
320	md_post_newfs();	320	md_post_newfs();
321	wrefresh(curscr);	321	wrefresh(curscr);
322	wmove(stdscr, 0, 0);	322	wmove(stdscr, 0, 0);
323	wclear(stdscr);	323	wclear(stdscr);
324	wrefresh(stdscr);	324	wrefresh(stdscr);
325	return 1;	325	return 1;
326	}	326	}
327		327
328	void	328	void
329	md_cleanup_install(void)	329	md_cleanup_install(void)
330	{	330	{
331	#ifndef DEBUG	331	#ifndef DEBUG
332	enable_rc_conf();	332	enable_rc_conf();
333
334	run_program(0, "rm -f %s", target_expand("/sysinst"));
335	run_program(0, "rm -f %s", target_expand("/.termcap"));
336	run_program(0, "rm -f %s", target_expand("/.profile"));
337	#endif	333	#endif
338	}	334	}
339		335
340	int	336	int
341	md_pre_update(void)	337	md_pre_update(void)
342	{	338	{
343	return 1;	339	return 1;
344	}	340	}
345		341
346	void	342	void
347	md_init(void)	343	md_init(void)
348	{	344	{
349	}	345	}

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: md.c,v 1.22 2008/01/28 02:47:13 rumble Exp $ */	1	/* $NetBSD: md.c,v 1.23 2008/10/07 09:58: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.
	@@ -320,30 +320,26 @@ md_update(void)		@@ -320,30 +320,26 @@ md_update(void)
320	md_post_newfs();	320	md_post_newfs();
321	wrefresh(curscr);	321	wrefresh(curscr);
322	wmove(stdscr, 0, 0);	322	wmove(stdscr, 0, 0);
323	wclear(stdscr);	323	wclear(stdscr);
324	wrefresh(stdscr);	324	wrefresh(stdscr);
325	return 1;	325	return 1;
326	}	326	}
327		327
328	void	328	void
329	md_cleanup_install(void)	329	md_cleanup_install(void)
330	{	330	{
331	#ifndef DEBUG	331	#ifndef DEBUG
332	enable_rc_conf();	332	enable_rc_conf();
333
334	run_program(0, "rm -f %s", target_expand("/sysinst"));
335	run_program(0, "rm -f %s", target_expand("/.termcap"));
336	run_program(0, "rm -f %s", target_expand("/.profile"));
337	#endif	333	#endif
338	}	334	}
339		335
340	int	336	int
341	md_pre_update(void)	337	md_pre_update(void)
342	{	338	{
343	return 1;	339	return 1;
344	}	340	}
345		341
346	void	342	void
347	md_init(void)	343	md_init(void)
348	{	344	{
349	}	345	}

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: md.c,v 1.44 2008/01/28 02:47:13 rumble Exp $ */	1	/* $NetBSD: md.c,v 1.45 2008/10/07 09:58: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.
	@@ -163,31 +163,28 @@ md_update(void)		@@ -163,31 +163,28 @@ md_update(void)
163	endwin();	163	endwin();
164	md_copy_filesystem ();	164	md_copy_filesystem ();
165	md_post_newfs();	165	md_post_newfs();
166	wrefresh(curscr);	166	wrefresh(curscr);
167	wmove(stdscr, 0, 0);	167	wmove(stdscr, 0, 0);
168	wclear(stdscr);	168	wclear(stdscr);
169	wrefresh(stdscr);	169	wrefresh(stdscr);
170	return 1;	170	return 1;
171	}	171	}
172		172
173	void	173	void
174	md_cleanup_install(void)	174	md_cleanup_install(void)
175	{	175	{
176	enable_rc_conf();
177		176
178	run_program(0, "rm -f %s", target_expand("/sysinst"));	177	enable_rc_conf();
179	run_program(0, "rm -f %s", target_expand("/.termcap"));
180	run_program(0, "rm -f %s", target_expand("/.profile"));
181	}	178	}
182		179
183	int	180	int
184	md_pre_update(void)	181	md_pre_update(void)
185	{	182	{
186	return 1;	183	return 1;
187	}	184	}
188		185
189	void	186	void
190	md_init(void)	187	md_init(void)
191	{	188	{
192	}	189	}
193		190

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: md.c,v 1.20 2008/01/28 02:47:13 rumble Exp $ */	1	/* $NetBSD: md.c,v 1.21 2008/10/07 09:58: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	* Written by Philip A. Nelson for Piermont Information Systems Inc.	7	* Written by Philip A. Nelson for Piermont Information Systems Inc.
8	*	8	*
9	* Redistribution and use in source and binary forms, with or without	9	* Redistribution and use in source and binary forms, with or without
10	* modification, are permitted provided that the following conditions	10	* modification, are permitted provided that the following conditions
11	* are met:	11	* are met:
12	* 1. Redistributions of source code must retain the above copyright	12	* 1. Redistributions of source code must retain the above copyright
13	* notice, this list of conditions and the following disclaimer.	13	* notice, this list of conditions and the following disclaimer.
14	* 2. Redistributions in binary form must reproduce the above copyright	14	* 2. Redistributions in binary form must reproduce the above copyright
	@@ -102,30 +102,26 @@ md_update(void)		@@ -102,30 +102,26 @@ md_update(void)
102	wrefresh(curscr);	102	wrefresh(curscr);
103	wmove(stdscr, 0, 0);	103	wmove(stdscr, 0, 0);
104	wclear(stdscr);	104	wclear(stdscr);
105	wrefresh(stdscr);	105	wrefresh(stdscr);
106	return 1;	106	return 1;
107	}	107	}
108		108
109		109
110	void	110	void
111	md_cleanup_install(void)	111	md_cleanup_install(void)
112	{	112	{
113		113
114	enable_rc_conf();	114	enable_rc_conf();
115
116	run_program(0, "rm -f %s", target_expand("/sysinst"));
117	run_program(0, "rm -f %s", target_expand("/.termcap"));
118	run_program(0, "rm -f %s", target_expand("/.profile"));
119	}	115	}
120		116
121	int	117	int
122	md_pre_update()	118	md_pre_update()
123	{	119	{
124	return 1;	120	return 1;
125	}	121	}
126		122
127	void	123	void
128	md_init()	124	md_init()
129	{	125	{
130	}	126	}
131		127

 @@ -1,14 +1,14 @@
-/*	$NetBSD: md.c,v 1.30 2008/09/13 16:59:42 tsutsui Exp $	*/
+/*	$NetBSD: md.c,v 1.31 2008/10/07 09:58:14 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
 @@ -305,30 +305,26 @@ md_update(void)
 	wrefresh(curscr);
 	wmove(stdscr, 0, 0);
 	wclear(stdscr);
 	wrefresh(stdscr);
 	return 1;
+}
 void
 md_cleanup_install(void)
+{
 	enable_rc_conf();
 	run_program(0, "rm -f %s", target_expand("/sysinst"));
 	run_program(0, "rm -f %s", target_expand("/.termcap"));
 	run_program(0, "rm -f %s", target_expand("/.profile"));
 	msg_display(MSG_howtoboot);
 	process_menu(MENU_ok, NULL);
+}
 int
 md_bios_info(char *dev)
+{
 	int cyl, head, sec;
 	msg_display(MSG_nobiosgeom, dlcyl, dlhead, dlsec);
 	if (guess_biosgeom_from_mbr(&mbr, &cyl, &head, &sec) >= 0)
 		msg_display_add(MSG_biosguess, cyl, head, sec);

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: md.c,v 1.21 2008/01/28 02:47:13 rumble Exp $ */	1	/* $NetBSD: md.c,v 1.22 2008/10/07 09:58: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	* Written by Philip A. Nelson for Piermont Information Systems Inc.	7	* Written by Philip A. Nelson for Piermont Information Systems Inc.
8	*	8	*
9	* Redistribution and use in source and binary forms, with or without	9	* Redistribution and use in source and binary forms, with or without
10	* modification, are permitted provided that the following conditions	10	* modification, are permitted provided that the following conditions
11	* are met:	11	* are met:
12	* 1. Redistributions of source code must retain the above copyright	12	* 1. Redistributions of source code must retain the above copyright
13	* notice, this list of conditions and the following disclaimer.	13	* notice, this list of conditions and the following disclaimer.
14	* 2. Redistributions in binary form must reproduce the above copyright	14	* 2. Redistributions in binary form must reproduce the above copyright
	@@ -129,30 +129,26 @@ md_update(void)		@@ -129,30 +129,26 @@ md_update(void)
129	wrefresh(curscr);	129	wrefresh(curscr);
130	wmove(stdscr, 0, 0);	130	wmove(stdscr, 0, 0);
131	wclear(stdscr);	131	wclear(stdscr);
132	wrefresh(stdscr);	132	wrefresh(stdscr);
133	return 1;	133	return 1;
134	}	134	}
135		135
136		136
137	void	137	void
138	md_cleanup_install(void)	138	md_cleanup_install(void)
139	{	139	{
140		140
141	enable_rc_conf();	141	enable_rc_conf();
142
143	run_program(0, "rm -f %s", target_expand("/sysinst"));
144	run_program(0, "rm -f %s", target_expand("/.termcap"));
145	run_program(0, "rm -f %s", target_expand("/.profile"));
146	}	142	}
147		143
148	int	144	int
149	md_pre_update(void)	145	md_pre_update(void)
150	{	146	{
151	return 1;	147	return 1;
152	}	148	}
153		149
154	void	150	void
155	md_init(void)	151	md_init(void)
156	{	152	{
157	}	153	}
158		154

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: md.c,v 1.50 2008/01/28 02:47:13 rumble Exp $ */	1	/* $NetBSD: md.c,v 1.51 2008/10/07 09:58: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	* Written by Philip A. Nelson for Piermont Information Systems Inc.	7	* Written by Philip A. Nelson for Piermont Information Systems Inc.
8	*	8	*
9	* Redistribution and use in source and binary forms, with or without	9	* Redistribution and use in source and binary forms, with or without
10	* modification, are permitted provided that the following conditions	10	* modification, are permitted provided that the following conditions
11	* are met:	11	* are met:
12	* 1. Redistributions of source code must retain the above copyright	12	* 1. Redistributions of source code must retain the above copyright
13	* notice, this list of conditions and the following disclaimer.	13	* notice, this list of conditions and the following disclaimer.
14	* 2. Redistributions in binary form must reproduce the above copyright	14	* 2. Redistributions in binary form must reproduce the above copyright
	@@ -138,26 +138,27 @@ md_update(void)		@@ -138,26 +138,27 @@ md_update(void)
138	wrefresh(stdscr);	138	wrefresh(stdscr);
139	return 1;	139	return 1;
140	}	140	}
141		141
142	void	142	void
143	md_cleanup_install(void)	143	md_cleanup_install(void)
144	{	144	{
145		145
146	enable_rc_conf();	146	enable_rc_conf();
147		147
148	run_program(0, "rm -f %s", target_expand("/sysinst"));	148	run_program(0, "rm -f %s", target_expand("/sysinst"));
149	run_program(0, "rm -f %s", target_expand("/.termcap"));	149	run_program(0, "rm -f %s", target_expand("/.termcap"));
150	run_program(0, "rm -f %s", target_expand("/.profile"));	150	run_program(0, "rm -f %s", target_expand("/.profile"));
		151	/* XXX - the above wipes /.profile from etc.tgz */
151	}	152	}
152		153
153	int	154	int
154	md_pre_update(void)	155	md_pre_update(void)
155	{	156	{
156	return 1;	157	return 1;
157	}	158	}
158		159
159	void	160	void
160	md_init(void)	161	md_init(void)
161	{	162	{
162	}	163	}
163		164

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: md.c,v 1.19 2008/01/28 02:47:13 rumble Exp $ */	1	/* $NetBSD: md.c,v 1.20 2008/10/07 09:58: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.
	@@ -173,30 +173,26 @@ md_update(void)		@@ -173,30 +173,26 @@ md_update(void)
173	md_post_newfs();	173	md_post_newfs();
174	wrefresh(curscr);	174	wrefresh(curscr);
175	wmove(stdscr, 0, 0);	175	wmove(stdscr, 0, 0);
176	wclear(stdscr);	176	wclear(stdscr);
177	wrefresh(stdscr);	177	wrefresh(stdscr);
178	return 1;	178	return 1;
179	}	179	}
180		180
181	void	181	void
182	md_cleanup_install(void)	182	md_cleanup_install(void)
183	{	183	{
184	#ifndef DEBUG	184	#ifndef DEBUG
185	enable_rc_conf();	185	enable_rc_conf();
186
187	run_program(0, "rm -f %s", target_expand("/sysinst"));
188	run_program(0, "rm -f %s", target_expand("/.termcap"));
189	run_program(0, "rm -f %s", target_expand("/.profile"));
190	#endif	186	#endif
191	}	187	}
192		188
193	int	189	int
194	md_pre_update(void)	190	md_pre_update(void)
195	{	191	{
196	return 1;	192	return 1;
197	}	193	}
198		194
199	void	195	void
200	md_init(void)	196	md_init(void)
201	{	197	{
202	}	198	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: md.c,v 1.1 2008/02/02 09:14:32 tsutsui Exp $	*/
+/*	$NetBSD: md.c,v 1.2 2008/10/07 09:58:14 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
 @@ -323,30 +323,26 @@ md_update(void)
 	wrefresh(curscr);
 	wmove(stdscr, 0, 0);
 	wclear(stdscr);
 	wrefresh(stdscr);
 	return 1;
+}
 void
 md_cleanup_install(void)
+{
 	enable_rc_conf();
 	run_program(0, "rm -f %s", target_expand("/sysinst"));
 	run_program(0, "rm -f %s", target_expand("/.termcap"));
 	run_program(0, "rm -f %s", target_expand("/.profile"));
+}
 int
 md_bios_info(char *dev)
+{
 	int cyl, head, sec;
 	msg_display(MSG_nobiosgeom, dlcyl, dlhead, 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 0;

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: md.c,v 1.20 2008/01/28 02:47:14 rumble Exp $ */	1	/* $NetBSD: md.c,v 1.21 2008/10/07 09:58: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.
	@@ -146,30 +146,26 @@ md_update(void)		@@ -146,30 +146,26 @@ md_update(void)
146	md_post_newfs();	146	md_post_newfs();
147	wrefresh(curscr);	147	wrefresh(curscr);
148	wmove(stdscr, 0, 0);	148	wmove(stdscr, 0, 0);
149	wclear(stdscr);	149	wclear(stdscr);
150	wrefresh(stdscr);	150	wrefresh(stdscr);
151	return 1;	151	return 1;
152	}	152	}
153		153
154	void	154	void
155	md_cleanup_install(void)	155	md_cleanup_install(void)
156	{	156	{
157	#ifndef DEBUG	157	#ifndef DEBUG
158	enable_rc_conf();	158	enable_rc_conf();
159
160	run_program(0, "rm -f %s", target_expand("/sysinst"));
161	run_program(0, "rm -f %s", target_expand("/.termcap"));
162	run_program(0, "rm -f %s", target_expand("/.profile"));
163	#endif	159	#endif
164	}	160	}
165		161
166	int	162	int
167	md_pre_update(void)	163	md_pre_update(void)
168	{	164	{
169	return 1;	165	return 1;
170	}	166	}
171		167
172	void	168	void
173	md_init(void)	169	md_init(void)
174	{	170	{
175	}	171	}

 @@ -1,14 +1,14 @@
-/* $NetBSD: md.c,v 1.3 2008/01/28 02:47:14 rumble Exp $ */
+/* $NetBSD: md.c,v 1.4 2008/10/07 09:58:14 abs Exp $ */
 /*
  * Copyright 1997,2002 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
 @@ -50,50 +50,32 @@
 int
 md_check_partitions(void)
+{
 	return 1;
+}
 void
 md_cleanup_install(void)
+{
 	enable_rc_conf();
 	run_program(0, "rm -f %s", target_expand("/sysinst"));
 	run_program(0, "rm -f %s", target_expand("/.termcap"));
 	run_program(0, "rm -f %s", target_expand("/.profile"));
+}
 int
 md_copy_filesystem(void)
+{
 #if 0
 	if (target_already_root()) {
 		return 0;
 	/* Copy the instbin(s) to the disk */
 	run_program(RUN_DISPLAY | RUN_PROGRESS,
 	    "pax -X -O -r -w -pe / %s", targetroot_mnt);
 	/* Copy next-stage install profile into target /.profile. */
 	if (cp_to_target ("/tmp/.hdprofile", "/.profile")!= 0)
 		return 1;
 	return cp_to_target ("/usr/share/misc/termcap", "/.termcap");
 #endif
 	return 0;
+}
 int
 md_get_info(void)
+{
 	read_mbr(diskdev, &mbr);
 	md_bios_info(diskdev);
 	return edit_mbr(&mbr);
+}
 int

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: md.c,v 1.26 2008/01/28 02:47:14 rumble Exp $ */	1	/* $NetBSD: md.c,v 1.27 2008/10/07 09:58:14 abs Exp $ */
2		2
3	/*	3	/*
4	* Copyright 1997,2002 Piermont Information Systems Inc.	4	* Copyright 1997,2002 Piermont Information Systems Inc.
5	* All rights reserved.	5	* All rights reserved.
6	*	6	*
7	* Written by Philip A. Nelson for Piermont Information Systems Inc.	7	* Written by Philip A. Nelson for Piermont Information Systems Inc.
8	*	8	*
9	* Redistribution and use in source and binary forms, with or without	9	* Redistribution and use in source and binary forms, with or without
10	* modification, are permitted provided that the following conditions	10	* modification, are permitted provided that the following conditions
11	* are met:	11	* are met:
12	* 1. Redistributions of source code must retain the above copyright	12	* 1. Redistributions of source code must retain the above copyright
13	* notice, this list of conditions and the following disclaimer.	13	* notice, this list of conditions and the following disclaimer.
14	* 2. Redistributions in binary form must reproduce the above copyright	14	* 2. Redistributions in binary form must reproduce the above copyright
	@@ -142,26 +142,27 @@ md_update(void)		@@ -142,26 +142,27 @@ md_update(void)
142	wrefresh(stdscr);	142	wrefresh(stdscr);
143	return 1;	143	return 1;
144	}	144	}
145		145
146	void	146	void
147	md_cleanup_install(void)	147	md_cleanup_install(void)
148	{	148	{
149		149
150	enable_rc_conf();	150	enable_rc_conf();
151		151
152	run_program(0, "rm -f %s", target_expand("/sysinst"));	152	run_program(0, "rm -f %s", target_expand("/sysinst"));
153	run_program(0, "rm -f %s", target_expand("/.termcap"));	153	run_program(0, "rm -f %s", target_expand("/.termcap"));
154	run_program(0, "rm -f %s", target_expand("/.profile"));	154	run_program(0, "rm -f %s", target_expand("/.profile"));
		155	/* XXX - the above wipes /.profile from etc.tgz */
155	}	156	}
156		157
157	int	158	int
158	md_pre_update(void)	159	md_pre_update(void)
159	{	160	{
160	return 1;	161	return 1;
161	}	162	}
162		163
163	void	164	void
164	md_init(void)	165	md_init(void)
165	{	166	{
166	}	167	}
167		168

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: md.c,v 1.5 2008/01/28 02:47:14 rumble Exp $ */	1	/* $NetBSD: md.c,v 1.6 2008/10/07 09:58: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.
	@@ -176,30 +176,26 @@ md_update(void)		@@ -176,30 +176,26 @@ md_update(void)
176	md_post_newfs();	176	md_post_newfs();
177	wrefresh(curscr);	177	wrefresh(curscr);
178	wmove(stdscr, 0, 0);	178	wmove(stdscr, 0, 0);
179	wclear(stdscr);	179	wclear(stdscr);
180	wrefresh(stdscr);	180	wrefresh(stdscr);
181	return 1;	181	return 1;
182	}	182	}
183		183
184	void	184	void
185	md_cleanup_install(void)	185	md_cleanup_install(void)
186	{	186	{
187		187
188	enable_rc_conf();	188	enable_rc_conf();
189
190	run_program(0, "rm -f %s", target_expand("/sysinst"));
191	run_program(0, "rm -f %s", target_expand("/.termcap"));
192	run_program(0, "rm -f %s", target_expand("/.profile"));
193	}	189	}
194		190
195	int	191	int
196	md_pre_update(void)	192	md_pre_update(void)
197	{	193	{
198		194
199	return 1;	195	return 1;
200	}	196	}
201		197
202	void	198	void
203	md_init(void)	199	md_init(void)
204	{	200	{
205	}	201	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: md.c,v 1.25 2008/01/28 02:47:14 rumble Exp $ */
+/*	$NetBSD: md.c,v 1.26 2008/10/07 09:58:14 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.
 @@ -220,29 +220,26 @@ md_update(void)
 	wmove(stdscr, 0, 0);
 	wclear(stdscr);
 	wrefresh(stdscr);
 	return 1;
+}
 void
 md_cleanup_install(void)
+{
 #ifdef notyet			/* sed is too large for ramdisk */
 	enable_rc_conf();
 #endif
 	run_program(0, "rm -f %s", target_expand("/sysinst"));
 	run_program(0, "rm -f %s", target_expand("/.termcap"));
 	run_program(0, "rm -f %s", target_expand("/.profile"));
+}
 int
 md_pre_update(void)
+{
 	if (get_ramsize() < 6)
 		set_swap(diskdev, NULL);
 	return 1;
+}
 void
 md_init(void)

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: md.c,v 1.6 2008/02/02 06:11:23 itohy Exp $ */	1	/* $NetBSD: md.c,v 1.7 2008/10/07 09:58: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.
	@@ -182,30 +182,26 @@ md_update(void)		@@ -182,30 +182,26 @@ md_update(void)
182	md_post_newfs();	182	md_post_newfs();
183	wrefresh(curscr);	183	wrefresh(curscr);
184	wmove(stdscr, 0, 0);	184	wmove(stdscr, 0, 0);
185	wclear(stdscr);	185	wclear(stdscr);
186	wrefresh(stdscr);	186	wrefresh(stdscr);
187	return 1;	187	return 1;
188	}	188	}
189		189
190	void	190	void
191	md_cleanup_install(void)	191	md_cleanup_install(void)
192	{	192	{
193		193
194	enable_rc_conf();	194	enable_rc_conf();
195
196	run_program(0, "rm -f %s", target_expand("/sysinst"));
197	run_program(0, "rm -f %s", target_expand("/.termcap"));
198	run_program(0, "rm -f %s", target_expand("/.profile"));
199	}	195	}
200		196
201	int	197	int
202	md_pre_update()	198	md_pre_update()
203	{	199	{
204	return 1;	200	return 1;
205	}	201	}
206		202
207	void	203	void
208	md_init()	204	md_init()
209	{	205	{
210	}	206	}
211		207

 @@ -1,14 +1,14 @@
-/*	$NetBSD: md.c,v 1.4 2008/01/28 02:47:14 rumble Exp $ */
+/*	$NetBSD: md.c,v 1.5 2008/10/07 09:58:14 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
 @@ -124,30 +124,26 @@ md_update(void)
 	wrefresh(curscr);
 	wmove(stdscr, 0, 0);
 	wclear(stdscr);
 	wrefresh(stdscr);
 	return 1;
+}
 void
 md_cleanup_install(void)
+{
 	enable_rc_conf();
 	run_program(0, "rm -f %s", target_expand("/sysinst"));
 	run_program(0, "rm -f %s", target_expand("/.termcap"));
 	run_program(0, "rm -f %s", target_expand("/.profile"));
+}
 int
 md_bios_info(char *dev)
+{
 	int cyl, head, sec;
 	msg_display(MSG_nobiosgeom, dlcyl, dlhead, 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 0;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: md.c,v 1.42 2008/01/28 02:47:14 rumble Exp $ */
+/*	$NetBSD: md.c,v 1.43 2008/10/07 09:58:15 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
 @@ -123,30 +123,26 @@ md_update(void)
 	wrefresh(curscr);
 	wmove(stdscr, 0, 0);
 	wclear(stdscr);
 	wrefresh(stdscr);
 	return 1;
+}
 void
 md_cleanup_install(void)
+{
 	enable_rc_conf();
 	run_program(0, "rm -f %s", target_expand("/sysinst"));
 	run_program(0, "rm -f %s", target_expand("/.termcap"));
 	run_program(0, "rm -f %s", target_expand("/.profile"));
+}
 int
 md_bios_info(char *dev)
+{
 	int cyl, head, sec;
 	msg_display(MSG_nobiosgeom, dlcyl, dlhead, 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 0;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: md.c,v 1.118 2008/01/28 02:47:14 rumble Exp $ */
+/*	$NetBSD: md.c,v 1.119 2008/10/07 09:58:15 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
 @@ -475,29 +475,26 @@ md_cleanup_install(void)
 	 * 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");
 	run_program(0, "rm -f %s", target_expand("/sysinst"));
 	run_program(0, "rm -f %s", target_expand("/.termcap"));
 	run_program(0, "rm -f %s", target_expand("/.profile"));
+}
 int
 md_bios_info(dev)
 	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, sec;

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: md.c,v 1.1 2008/04/14 17:24:56 skrll Exp $ */	1	/* $NetBSD: md.c,v 1.2 2008/10/07 09:58:15 abs Exp $ */
2		2
3	/*	3	/*
4	* Copyright 1997,2002 Piermont Information Systems Inc.	4	* Copyright 1997,2002 Piermont Information Systems Inc.
5	* All rights reserved.	5	* All rights reserved.
6	*	6	*
7	* Written by Philip A. Nelson for Piermont Information Systems Inc.	7	* Written by Philip A. Nelson for Piermont Information Systems Inc.
8	*	8	*
9	* Redistribution and use in source and binary forms, with or without	9	* Redistribution and use in source and binary forms, with or without
10	* modification, are permitted provided that the following conditions	10	* modification, are permitted provided that the following conditions
11	* are met:	11	* are met:
12	* 1. Redistributions of source code must retain the above copyright	12	* 1. Redistributions of source code must retain the above copyright
13	* notice, this list of conditions and the following disclaimer.	13	* notice, this list of conditions and the following disclaimer.
14	* 2. Redistributions in binary form must reproduce the above copyright	14	* 2. Redistributions in binary form must reproduce the above copyright
	@@ -50,30 +50,26 @@		@@ -50,30 +50,26 @@
50		50
51	int	51	int
52	md_check_partitions(void)	52	md_check_partitions(void)
53	{	53	{
54		54
55	return 1;	55	return 1;
56	}	56	}
57		57
58	void	58	void
59	md_cleanup_install(void)	59	md_cleanup_install(void)
60	{	60	{
61		61
62	enable_rc_conf();	62	enable_rc_conf();
63
64	run_program(0, "rm -f %s", target_expand("/sysinst"));
65	run_program(0, "rm -f %s", target_expand("/.termcap"));
66	run_program(0, "rm -f %s", target_expand("/.profile"));
67	}	63	}
68		64
69	int	65	int
70	md_copy_filesystem(void)	66	md_copy_filesystem(void)
71	{	67	{
72		68
73	return 0;	69	return 0;
74	}	70	}
75		71
76	int	72	int
77	md_get_info(void)	73	md_get_info(void)
78	{	74	{
79		75

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: md.c,v 1.52 2008/05/24 21:42:52 hauke Exp $ */	1	/* $NetBSD: md.c,v 1.53 2008/10/07 09:58:15 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	* Written by Philip A. Nelson for Piermont Information Systems Inc.	7	* Written by Philip A. Nelson for Piermont Information Systems Inc.
8	*	8	*
9	* Redistribution and use in source and binary forms, with or without	9	* Redistribution and use in source and binary forms, with or without
10	* modification, are permitted provided that the following conditions	10	* modification, are permitted provided that the following conditions
11	* are met:	11	* are met:
12	* 1. Redistributions of source code must retain the above copyright	12	* 1. Redistributions of source code must retain the above copyright
13	* notice, this list of conditions and the following disclaimer.	13	* notice, this list of conditions and the following disclaimer.
14	* 2. Redistributions in binary form must reproduce the above copyright	14	* 2. Redistributions in binary form must reproduce the above copyright
	@@ -1123,30 +1123,26 @@ md_update (void)		@@ -1123,30 +1123,26 @@ md_update (void)
1123	wrefresh(curscr);	1123	wrefresh(curscr);
1124	wmove(stdscr, 0, 0);	1124	wmove(stdscr, 0, 0);
1125	wclear(stdscr);	1125	wclear(stdscr);
1126	wrefresh(stdscr);	1126	wrefresh(stdscr);
1127	return 1;	1127	return 1;
1128	}	1128	}
1129		1129
1130		1130
1131	void	1131	void
1132	md_cleanup_install(void)	1132	md_cleanup_install(void)
1133	{	1133	{
1134		1134
1135	enable_rc_conf();	1135	enable_rc_conf();
1136
1137	run_program(0, "rm -f %s", target_expand("/sysinst"));
1138	run_program(0, "rm -f %s", target_expand("/.termcap"));
1139	run_program(0, "rm -f %s", target_expand("/.profile"));
1140	}	1136	}
1141		1137
1142	int	1138	int
1143	md_pre_update()	1139	md_pre_update()
1144	{	1140	{
1145	return 0;	1141	return 0;
1146	}	1142	}
1147		1143
1148	void	1144	void
1149	md_init()	1145	md_init()
1150	{	1146	{
1151	}	1147	}
1152		1148

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: md.c,v 1.39 2008/01/28 02:47:15 rumble Exp $ */	1	/* $NetBSD: md.c,v 1.40 2008/10/07 09:58:15 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.
	@@ -165,32 +165,28 @@ md_update(void)		@@ -165,32 +165,28 @@ md_update(void)
165	endwin();	165	endwin();
166	md_copy_filesystem ();	166	md_copy_filesystem ();
167	md_post_newfs();	167	md_post_newfs();
168	wrefresh(curscr);	168	wrefresh(curscr);
169	wmove(stdscr, 0, 0);	169	wmove(stdscr, 0, 0);
170	wclear(stdscr);	170	wclear(stdscr);
171	wrefresh(stdscr);	171	wrefresh(stdscr);
172	return 1;	172	return 1;
173	}	173	}
174		174
175	void	175	void
176	md_cleanup_install(void)	176	md_cleanup_install(void)
177	{	177	{
178
179	enable_rc_conf();
180		178
181	run_program(0, "rm -f %s", target_expand("/sysinst"));	179	enable_rc_conf();
182	run_program(0, "rm -f %s", target_expand("/.termcap"));
183	run_program(0, "rm -f %s", target_expand("/.profile"));
184	}	180	}
185		181
186	int	182	int
187	md_pre_update(void)	183	md_pre_update(void)
188	{	184	{
189	return 1;	185	return 1;
190	}	186	}
191		187
192	void	188	void
193	md_init(void)	189	md_init(void)
194	{	190	{
195	}	191	}
196		192

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: md.c,v 1.14 2008/01/28 02:47:15 rumble Exp $ */	1	/* $NetBSD: md.c,v 1.15 2008/10/07 09:58:15 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	* Written by Philip A. Nelson for Piermont Information Systems Inc.	7	* Written by Philip A. Nelson for Piermont Information Systems Inc.
8	*	8	*
9	* Redistribution and use in source and binary forms, with or without	9	* Redistribution and use in source and binary forms, with or without
10	* modification, are permitted provided that the following conditions	10	* modification, are permitted provided that the following conditions
11	* are met:	11	* are met:
12	* 1. Redistributions of source code must retain the above copyright	12	* 1. Redistributions of source code must retain the above copyright
13	* notice, this list of conditions and the following disclaimer.	13	* notice, this list of conditions and the following disclaimer.
14	* 2. Redistributions in binary form must reproduce the above copyright	14	* 2. Redistributions in binary form must reproduce the above copyright
	@@ -193,30 +193,26 @@ md_update(void)		@@ -193,30 +193,26 @@ md_update(void)
193	md_post_newfs();	193	md_post_newfs();
194	clearok(stdscr, TRUE);	194	clearok(stdscr, TRUE);
195	wmove(stdscr, 0, 0);	195	wmove(stdscr, 0, 0);
196	wclear(stdscr);	196	wclear(stdscr);
197	wrefresh(stdscr);	197	wrefresh(stdscr);
198	return 1;	198	return 1;
199	}	199	}
200		200
201	void	201	void
202	md_cleanup_install(void)	202	md_cleanup_install(void)
203	{	203	{
204		204
205	enable_rc_conf();	205	enable_rc_conf();
206
207	run_program(0, "rm -f %s", target_expand("/sysinst"));
208	run_program(0, "rm -f %s", target_expand("/.termcap"));
209	run_program(0, "rm -f %s", target_expand("/.profile"));
210	}	206	}
211		207
212	int	208	int
213	md_pre_update()	209	md_pre_update()
214	{	210	{
215	return 1;	211	return 1;
216	}	212	}
217		213
218	void	214	void
219	md_init()	215	md_init()
220	{	216	{
221	}	217	}
222		218

 @@ -1,14 +1,14 @@
-/*	$NetBSD: md.c,v 1.20 2008/01/28 02:47:15 rumble Exp $	*/
+/*	$NetBSD: md.c,v 1.21 2008/10/07 09:58:15 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.
 @@ -220,29 +220,26 @@ md_update(void)
 	wmove(stdscr, 0, 0);
 	wclear(stdscr);
 	wrefresh(stdscr);
 	return (1);
+}
 void
 md_cleanup_install(void)
+{
 #ifdef notyet			/* sed is too large for ramdisk */
 	enable_rc_conf();
 #endif
 	run_program(0, "rm -f %s", target_expand("/sysinst"));
 	run_program(0, "rm -f %s", target_expand("/.termcap"));
 	run_program(0, "rm -f %s", target_expand("/.profile"));
+}
 int
 md_pre_update()
+{
 	if (get_ramsize() < 6)
 		set_swap(diskdev, NULL);
 	return (1);
+}
 void
 md_init()

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: md.c,v 1.28 2008/01/28 02:47:15 rumble Exp $ */	1	/* $NetBSD: md.c,v 1.29 2008/10/07 09:58:15 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.
	@@ -189,30 +189,26 @@ md_update(void)		@@ -189,30 +189,26 @@ md_update(void)
189	md_post_newfs();	189	md_post_newfs();
190	wrefresh(curscr);	190	wrefresh(curscr);
191	wmove(stdscr, 0, 0);	191	wmove(stdscr, 0, 0);
192	wclear(stdscr);	192	wclear(stdscr);
193	wrefresh(stdscr);	193	wrefresh(stdscr);
194	return 1;	194	return 1;
195	}	195	}
196		196
197	void	197	void
198	md_cleanup_install(void)	198	md_cleanup_install(void)
199	{	199	{
200		200
201	enable_rc_conf();	201	enable_rc_conf();
202
203	run_program(0, "rm -f %s", target_expand("/sysinst"));
204	run_program(0, "rm -f %s", target_expand("/.termcap"));
205	run_program(0, "rm -f %s", target_expand("/.profile"));
206	}	202	}
207		203
208	int	204	int
209	md_pre_update(void)	205	md_pre_update(void)
210	{	206	{
211		207
212	return 1;	208	return 1;
213	}	209	}
214		210
215	void	211	void
216	md_init(void)	212	md_init(void)
217	{	213	{
218	}	214	}

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: md.c,v 1.16 2008/01/28 02:47:15 rumble Exp $ */	1	/* $NetBSD: md.c,v 1.17 2008/10/07 09:58:15 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.
	@@ -185,30 +185,26 @@ md_update()		@@ -185,30 +185,26 @@ md_update()
185	md_post_newfs();	185	md_post_newfs();
186	wrefresh(curscr);	186	wrefresh(curscr);
187	wmove(stdscr, 0, 0);	187	wmove(stdscr, 0, 0);
188	wclear(stdscr);	188	wclear(stdscr);
189	wrefresh(stdscr);	189	wrefresh(stdscr);
190	return 1;	190	return 1;
191	}	191	}
192		192
193	void	193	void
194	md_cleanup_install()	194	md_cleanup_install()
195	{	195	{
196		196
197	enable_rc_conf();	197	enable_rc_conf();
198
199	run_program(0, "rm -f %s", target_expand("/sysinst"));
200	run_program(0, "rm -f %s", target_expand("/.termcap"));
201	run_program(0, "rm -f %s", target_expand("/.profile"));
202	}	198	}
203		199
204	int	200	int
205	md_pre_update()	201	md_pre_update()
206	{	202	{
207	return 1;	203	return 1;
208	}	204	}
209		205
210	void	206	void
211	md_init()	207	md_init()
212	{	208	{
213	}	209	}
214		210

 @@ -1,14 +1,14 @@
-/*	$NetBSD: md.c,v 1.3 2008/01/28 02:47:15 rumble Exp $	*/
+/*	$NetBSD: md.c,v 1.4 2008/10/07 09:58:15 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
 @@ -440,30 +440,26 @@ md_update(void)
 	md_post_newfs();
 	wrefresh(curscr);
 	wmove(stdscr, 0, 0);
 	wclear(stdscr);
 	wrefresh(stdscr);
 	return 1;
+}
 void
 md_cleanup_install(void)
+{
 	enable_rc_conf();
 	run_program(0, "rm -f %s", target_expand("/sysinst"));
 	run_program(0, "rm -f %s", target_expand("/.termcap"));
 	run_program(0, "rm -f %s", target_expand("/.profile"));
+}
 int
 md_pre_update(void)
+{
 	struct mbr_partition *part;
 	mbr_info_t *ext;
 	int i;
 	read_mbr(diskdev, &mbr);
 	/* do a sanity check of the partition table */
 	for (ext = &mbr; ext; ext = ext->extended) {
 		part = ext->mbr.mbr_parts;

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: md.c,v 1.21 2008/01/28 02:47:16 rumble Exp $ */	1	/* $NetBSD: md.c,v 1.22 2008/10/07 09:58:15 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	* Written by Philip A. Nelson for Piermont Information Systems Inc.	7	* Written by Philip A. Nelson for Piermont Information Systems Inc.
8	*	8	*
9	* Redistribution and use in source and binary forms, with or without	9	* Redistribution and use in source and binary forms, with or without
10	* modification, are permitted provided that the following conditions	10	* modification, are permitted provided that the following conditions
11	* are met:	11	* are met:
12	* 1. Redistributions of source code must retain the above copyright	12	* 1. Redistributions of source code must retain the above copyright
13	* notice, this list of conditions and the following disclaimer.	13	* notice, this list of conditions and the following disclaimer.
14	* 2. Redistributions in binary form must reproduce the above copyright	14	* 2. Redistributions in binary form must reproduce the above copyright
	@@ -127,30 +127,26 @@ md_update()		@@ -127,30 +127,26 @@ md_update()
127	wrefresh(curscr);	127	wrefresh(curscr);
128	wmove(stdscr, 0, 0);	128	wmove(stdscr, 0, 0);
129	wclear(stdscr);	129	wclear(stdscr);
130	wrefresh(stdscr);	130	wrefresh(stdscr);
131		131
132	return (1);	132	return (1);
133	}	133	}
134		134
135	void	135	void
136	md_cleanup_install()	136	md_cleanup_install()
137	{	137	{
138		138
139	enable_rc_conf();	139	enable_rc_conf();
140
141	run_program(0, "rm -f %s", target_expand("/sysinst"));
142	run_program(0, "rm -f %s", target_expand("/.termcap"));
143	run_program(0, "rm -f %s", target_expand("/.profile"));
144	}	140	}
145		141
146	int	142	int
147	md_pre_update()	143	md_pre_update()
148	{	144	{
149		145
150	return (1);	146	return (1);
151	}	147	}
152		148
153	void	149	void
154	md_init()	150	md_init()
155	{	151	{
156	/* Nothing to do */	152	/* Nothing to do */

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: md.c,v 1.60 2008/01/28 02:47:16 rumble Exp $ */	1	/* $NetBSD: md.c,v 1.61 2008/10/07 09:58:15 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	* Written by Philip A. Nelson for Piermont Information Systems Inc.	7	* Written by Philip A. Nelson for Piermont Information Systems Inc.
8	*	8	*
9	* Redistribution and use in source and binary forms, with or without	9	* Redistribution and use in source and binary forms, with or without
10	* modification, are permitted provided that the following conditions	10	* modification, are permitted provided that the following conditions
11	* are met:	11	* are met:
12	* 1. Redistributions of source code must retain the above copyright	12	* 1. Redistributions of source code must retain the above copyright
13	* notice, this list of conditions and the following disclaimer.	13	* notice, this list of conditions and the following disclaimer.
14	* 2. Redistributions in binary form must reproduce the above copyright	14	* 2. Redistributions in binary form must reproduce the above copyright
	@@ -192,30 +192,26 @@ md_update(void)		@@ -192,30 +192,26 @@ md_update(void)
192	md_post_newfs();	192	md_post_newfs();
193	wrefresh(curscr);	193	wrefresh(curscr);
194	wmove(stdscr, 0, 0);	194	wmove(stdscr, 0, 0);
195	wclear(stdscr);	195	wclear(stdscr);
196	wrefresh(stdscr);	196	wrefresh(stdscr);
197	return 1;	197	return 1;
198	}	198	}
199		199
200	void	200	void
201	md_cleanup_install(void)	201	md_cleanup_install(void)
202	{	202	{
203		203
204	enable_rc_conf();	204	enable_rc_conf();
205
206	run_program(0, "rm -f %s", target_expand("/sysinst"));
207	run_program(0, "rm -f %s", target_expand("/.termcap"));
208	run_program(0, "rm -f %s", target_expand("/.profile"));
209	}	205	}
210		206
211	int	207	int
212	md_pre_update()	208	md_pre_update()
213	{	209	{
214	return 1;	210	return 1;
215	}	211	}
216		212
217	void	213	void
218	md_init()	214	md_init()
219	{	215	{
220	}	216	}
221		217

 @@ -1,14 +1,14 @@
-/*	$NetBSD: md.c,v 1.28 2008/01/28 02:47:16 rumble Exp $	*/
+/*	$NetBSD: md.c,v 1.29 2008/10/07 09:58:15 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
 @@ -206,30 +206,26 @@ md_update(void)
 	md_post_newfs();
 	wrefresh(curscr);
 	wmove(stdscr, 0, 0);
 	wclear(stdscr);
 	wrefresh(stdscr);
 	return 1;
+}
 void
 md_cleanup_install(void)
+{
 	enable_rc_conf();
 	run_program(0, "rm -f %s", target_expand("/sysinst"));
 	run_program(0, "rm -f %s", target_expand("/.termcap"));
 	run_program(0, "rm -f %s", target_expand("/.profile"));
 	run_program(0, "rm -f %s", target_expand("/.bootimage"));
+}
 int
 md_pre_update(void)
+{
 	struct mbr_partition *part;
 	mbr_info_t *ext;
 	int i;
 	read_mbr(diskdev, &mbr);
 	/* do a sanity check of the partition table */

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: md.c,v 1.27 2008/01/28 02:47:16 rumble Exp $ */	1	/* $NetBSD: md.c,v 1.28 2008/10/07 09:58:15 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	* Written by Philip A. Nelson for Piermont Information Systems Inc.	7	* Written by Philip A. Nelson for Piermont Information Systems Inc.
8	*	8	*
9	* Redistribution and use in source and binary forms, with or without	9	* Redistribution and use in source and binary forms, with or without
10	* modification, are permitted provided that the following conditions	10	* modification, are permitted provided that the following conditions
11	* are met:	11	* are met:
12	* 1. Redistributions of source code must retain the above copyright	12	* 1. Redistributions of source code must retain the above copyright
13	* notice, this list of conditions and the following disclaimer.	13	* notice, this list of conditions and the following disclaimer.
14	* 2. Redistributions in binary form must reproduce the above copyright	14	* 2. Redistributions in binary form must reproduce the above copyright
	@@ -142,26 +142,27 @@ md_update(void)		@@ -142,26 +142,27 @@ md_update(void)
142	wrefresh(stdscr);	142	wrefresh(stdscr);
143	return 1;	143	return 1;
144	}	144	}
145		145
146	void	146	void
147	md_cleanup_install(void)	147	md_cleanup_install(void)
148	{	148	{
149		149
150	enable_rc_conf();	150	enable_rc_conf();
151		151
152	run_program(0, "rm -f %s", target_expand("/sysinst"));	152	run_program(0, "rm -f %s", target_expand("/sysinst"));
153	run_program(0, "rm -f %s", target_expand("/.termcap"));	153	run_program(0, "rm -f %s", target_expand("/.termcap"));
154	run_program(0, "rm -f %s", target_expand("/.profile"));	154	run_program(0, "rm -f %s", target_expand("/.profile"));
		155	/* XXX - the above wipes /.profile from etc.tgz */
155	}	156	}
156		157
157	int	158	int
158	md_pre_update(void)	159	md_pre_update(void)
159	{	160	{
160	return 1;	161	return 1;
161	}	162	}
162		163
163	void	164	void
164	md_init(void)	165	md_init(void)
165	{	166	{
166	}	167	}
167		168

 @@ -1,14 +1,14 @@
-/*	$NetBSD: md.c,v 1.23 2008/01/28 02:47:16 rumble Exp $	*/
+/*	$NetBSD: md.c,v 1.24 2008/10/07 09:58:15 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
 @@ -168,30 +168,26 @@ md_update(void)
 	md_post_newfs();
 	wrefresh(curscr);
 	wmove(stdscr, 0, 0);
 	wclear(stdscr);
 	wrefresh(stdscr);
 	return 1;
+}
 void
 md_cleanup_install(void)
+{
 	enable_rc_conf();
 	run_program(0, "rm -f %s", target_expand("/sysinst"));
 	run_program(0, "rm -f %s", target_expand("/.termcap"));
 	run_program(0, "rm -f %s", target_expand("/.profile"));
 	if (strstr(instsys.version, "(GENERIC32_IP12)"))
 		run_program(0, "/usr/mdec/sgivol -f -w netbsd %s %s",
 			    target_expand("/netbsd.ecoff"), diskdev);
+}
 int
 md_pre_update()
+{
 	return 1;
+}
 void

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: md.c,v 1.22 2008/01/28 02:47:16 rumble Exp $ */	1	/* $NetBSD: md.c,v 1.23 2008/10/07 09:58:15 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.
	@@ -187,29 +187,26 @@ md_update(void)		@@ -187,29 +187,26 @@ md_update(void)
187	void	187	void
188	md_cleanup_install(void)	188	md_cleanup_install(void)
189	{	189	{
190	#ifndef DEBUG	190	#ifndef DEBUG
191	enable_rc_conf();	191	enable_rc_conf();
192		192
193	add_rc_conf("wscons=YES\n");	193	add_rc_conf("wscons=YES\n");
194		194
195	/* Configure a single screen. */	195	/* Configure a single screen. */
196	run_program(RUN_CHROOT,	196	run_program(RUN_CHROOT,
197	"sed -an -e '/^screen/s/^/#/;/^mux/s/^/#/;"	197	"sed -an -e '/^screen/s/^/#/;/^mux/s/^/#/;"
198	"H;$!d;g;w /etc/wscons.conf' /etc/wscons.conf");	198	"H;$!d;g;w /etc/wscons.conf' /etc/wscons.conf");
199		199
200	run_program(0, "rm -f %s", target_expand("/sysinst"));
201	run_program(0, "rm -f %s", target_expand("/.termcap"));
202	run_program(0, "rm -f %s", target_expand("/.profile"));
203	#endif	200	#endif
204	}	201	}
205		202
206	int	203	int
207	md_pre_update(void)	204	md_pre_update(void)
208	{	205	{
209	return 1;	206	return 1;
210	}	207	}
211		208
212	void	209	void
213	md_init(void)	210	md_init(void)
214	{	211	{
215	}	212	}

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: md.c,v 1.46 2008/01/28 02:47:17 rumble Exp $ */	1	/* $NetBSD: md.c,v 1.47 2008/10/07 09:58:16 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.
	@@ -180,30 +180,26 @@ md_update(void)		@@ -180,30 +180,26 @@ md_update(void)
180	md_post_newfs();	180	md_post_newfs();
181	wrefresh(curscr);	181	wrefresh(curscr);
182	wmove(stdscr, 0, 0);	182	wmove(stdscr, 0, 0);
183	wclear(stdscr);	183	wclear(stdscr);
184	wrefresh(stdscr);	184	wrefresh(stdscr);
185	return 1;	185	return 1;
186	}	186	}
187		187
188	void	188	void
189	md_cleanup_install(void)	189	md_cleanup_install(void)
190	{	190	{
191		191
192	enable_rc_conf();	192	enable_rc_conf();
193
194	run_program(0, "rm -f %s", target_expand("/sysinst"));
195	run_program(0, "rm -f %s", target_expand("/.termcap"));
196	run_program(0, "rm -f %s", target_expand("/.profile"));
197	}	193	}
198		194
199	int	195	int
200	md_pre_update()	196	md_pre_update()
201	{	197	{
202	return 1;	198	return 1;
203	}	199	}
204		200
205	void	201	void
206	md_init()	202	md_init()
207	{	203	{
208	}	204	}
209		205

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: md.c,v 1.22 2008/01/28 02:47:17 rumble Exp $ */	1	/* $NetBSD: md.c,v 1.23 2008/10/07 09:58:16 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.
	@@ -178,30 +178,26 @@ md_update(void)		@@ -178,30 +178,26 @@ md_update(void)
178	md_post_newfs();	178	md_post_newfs();
179	wrefresh(curscr);	179	wrefresh(curscr);
180	wmove(stdscr, 0, 0);	180	wmove(stdscr, 0, 0);
181	wclear(stdscr);	181	wclear(stdscr);
182	wrefresh(stdscr);	182	wrefresh(stdscr);
183	return 1;	183	return 1;
184	}	184	}
185		185
186	void	186	void
187	md_cleanup_install(void)	187	md_cleanup_install(void)
188	{	188	{
189		189
190	enable_rc_conf();	190	enable_rc_conf();
191
192	run_program(0, "rm -f %s", target_expand("/sysinst"));
193	run_program(0, "rm -f %s", target_expand("/.termcap"));
194	run_program(0, "rm -f %s", target_expand("/.profile"));
195	}	191	}
196		192
197	int	193	int
198	md_pre_update()	194	md_pre_update()
199	{	195	{
200	return 1;	196	return 1;
201	}	197	}
202		198
203	void	199	void
204	md_init()	200	md_init()
205	{	201	{
206	}	202	}
207		203

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: md.c,v 1.32 2008/01/28 02:47:17 rumble Exp $ */	1	/* $NetBSD: md.c,v 1.33 2008/10/07 09:58:16 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.
	@@ -177,30 +177,26 @@ md_update(void)		@@ -177,30 +177,26 @@ md_update(void)
177	md_post_newfs();	177	md_post_newfs();
178	wrefresh(curscr);	178	wrefresh(curscr);
179	wmove(stdscr, 0, 0);	179	wmove(stdscr, 0, 0);
180	wclear(stdscr);	180	wclear(stdscr);
181	wrefresh(stdscr);	181	wrefresh(stdscr);
182	return 1;	182	return 1;
183	}	183	}
184		184
185	void	185	void
186	md_cleanup_install(void)	186	md_cleanup_install(void)
187	{	187	{
188		188
189	enable_rc_conf();	189	enable_rc_conf();
190
191	run_program(0, "rm -f %s", target_expand("/sysinst"));
192	run_program(0, "rm -f %s", target_expand("/.termcap"));
193	run_program(0, "rm -f %s", target_expand("/.profile"));
194	}	190	}
195		191
196	int	192	int
197	md_pre_update()	193	md_pre_update()
198	{	194	{
199	return 1;	195	return 1;
200	}	196	}
201		197
202	void	198	void
203	md_init()	199	md_init()
204	{	200	{
205	}	201	}
206		202

 @@ -1,14 +1,14 @@
-/*	$NetBSD: md.c,v 1.35 2008/01/28 02:47:17 rumble Exp $ */
+/*	$NetBSD: md.c,v 1.36 2008/10/07 09:58:16 abs Exp $ */
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Based on code written by Philip A. Nelson for Piermont Information
  * Systems Inc.  Modified by Minoura Makoto for x68k.
+ *
  * 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.
 @@ -311,29 +311,26 @@ md_update(void)
 	wmove(stdscr, 0, 0);
 	wclear(stdscr);
 	wrefresh(stdscr);
 	return 1;
+}
 void
 md_cleanup_install(void)
+{
 #ifdef notyet			/* sed is too large for ramdisk */
 	enable_rc_conf();
 #endif
 	run_program(0, "rm -f %s", target_expand("/sysinst"));
 	run_program(0, "rm -f %s", target_expand("/.termcap"));
 	run_program(0, "rm -f %s", target_expand("/.profile"));
+}
 int
 md_pre_update()
+{
 	if (get_ramsize() < 6)
 		set_swap(diskdev, NULL);
 	return 1;
+}
 void
 md_init()
+{

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: md.c,v 1.2 2008/04/10 15:45:29 nonaka Exp $ */	1	/* $NetBSD: md.c,v 1.3 2008/10/07 09:58:16 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.
	@@ -134,30 +134,26 @@ md_update(void)		@@ -134,30 +134,26 @@ md_update(void)
134	md_post_newfs();	134	md_post_newfs();
135	wrefresh(curscr);	135	wrefresh(curscr);
136	wmove(stdscr, 0, 0);	136	wmove(stdscr, 0, 0);
137	wclear(stdscr);	137	wclear(stdscr);
138	wrefresh(stdscr);	138	wrefresh(stdscr);
139	return 1;	139	return 1;
140	}	140	}
141		141
142	void	142	void
143	md_cleanup_install(void)	143	md_cleanup_install(void)
144	{	144	{
145		145
146	enable_rc_conf();	146	enable_rc_conf();
147
148	run_program(0, "rm -f %s", target_expand("/sysinst"));
149	run_program(0, "rm -f %s", target_expand("/.termcap"));
150	run_program(0, "rm -f %s", target_expand("/.profile"));
151	}	147	}
152		148
153	int	149	int
154	md_pre_update(void)	150	md_pre_update(void)
155	{	151	{
156		152
157	return 1;	153	return 1;
158	}	154	}
159		155
160	void	156	void
161	md_init(void)	157	md_init(void)
162	{	158	{
163		159